Sat, 26 Feb 2011 18:14:12 +0100
Added functionality to the VCS status dialogs to make them more general commit dialogs.
--- a/APIs/Python3/eric5.api Sat Feb 26 14:28:21 2011 +0100 +++ b/APIs/Python3/eric5.api Sat Feb 26 18:14:12 2011 +0100 @@ -3250,11 +3250,20 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.HgServeDialog?1(vcs, path, parent = None) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.keyPressEvent?4(evt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_addButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_commitButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_diffButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_forgetButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_refreshButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_restoreButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_revertButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_sendButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusFilterCombo_activated?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusList_itemChanged?4(item, column) +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusList_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.start?4(fn) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog?1(vcs, parent = None) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._performMonitor?5() @@ -3471,8 +3480,16 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog?1(vcs, mode = "browse", parent = None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog.getRevisions?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog?1(parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_addButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_commitButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_diffButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_refreshButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_restoreButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_revertButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_statusFilterCombo_activated?4(txt) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_statusList_itemChanged?4(item, column) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_statusList_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.start?4(fn) eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog?1(vcs, parent = None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusMonitorThread.SvnStatusMonitorThread._performMonitor?5() @@ -3680,11 +3697,19 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog?1(parent = None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.keyPressEvent?4(evt) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_addButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_commitButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_diffButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_refreshButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_restoreButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_revertButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_sendButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_statusFilterCombo_activated?4(txt) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_statusList_itemChanged?4(item, column) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_statusList_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.start?4(fn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog?1(vcs, parent = None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusMonitorThread.SvnStatusMonitorThread._performMonitor?5()
--- a/Documentation/Help/source.qhp Sat Feb 26 14:28:21 2011 +0100 +++ b/Documentation/Help/source.qhp Sat Feb 26 18:14:12 2011 +0100 @@ -8235,9 +8235,11 @@ <keyword name="HgStatusDialog.__add" id="HgStatusDialog.__add" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__add" /> <keyword name="HgStatusDialog.__commit" id="HgStatusDialog.__commit" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commit" /> <keyword name="HgStatusDialog.__committed" id="HgStatusDialog.__committed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__committed" /> + <keyword name="HgStatusDialog.__diff" id="HgStatusDialog.__diff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__diff" /> <keyword name="HgStatusDialog.__finish" id="HgStatusDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__finish" /> <keyword name="HgStatusDialog.__forget" id="HgStatusDialog.__forget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__forget" /> <keyword name="HgStatusDialog.__generateItem" id="HgStatusDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__generateItem" /> + <keyword name="HgStatusDialog.__getCommitableItems" id="HgStatusDialog.__getCommitableItems" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__getCommitableItems" /> <keyword name="HgStatusDialog.__getMissingItems" id="HgStatusDialog.__getMissingItems" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__getMissingItems" /> <keyword name="HgStatusDialog.__getModifiedItems" id="HgStatusDialog.__getModifiedItems" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__getModifiedItems" /> <keyword name="HgStatusDialog.__getUnversionedItems" id="HgStatusDialog.__getUnversionedItems" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__getUnversionedItems" /> @@ -8246,15 +8248,27 @@ <keyword name="HgStatusDialog.__readStdout" id="HgStatusDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__readStdout" /> <keyword name="HgStatusDialog.__resizeColumns" id="HgStatusDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__resizeColumns" /> <keyword name="HgStatusDialog.__resort" id="HgStatusDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__resort" /> + <keyword name="HgStatusDialog.__restoreMissing" id="HgStatusDialog.__restoreMissing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__restoreMissing" /> <keyword name="HgStatusDialog.__revert" id="HgStatusDialog.__revert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__revert" /> <keyword name="HgStatusDialog.__showContextMenu" id="HgStatusDialog.__showContextMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__showContextMenu" /> + <keyword name="HgStatusDialog.__updateButtons" id="HgStatusDialog.__updateButtons" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__updateButtons" /> + <keyword name="HgStatusDialog.__updateCommitButton" id="HgStatusDialog.__updateCommitButton" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__updateCommitButton" /> <keyword name="HgStatusDialog.closeEvent" id="HgStatusDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.closeEvent" /> <keyword name="HgStatusDialog.keyPressEvent" id="HgStatusDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.keyPressEvent" /> + <keyword name="HgStatusDialog.on_addButton_clicked" id="HgStatusDialog.on_addButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_addButton_clicked" /> <keyword name="HgStatusDialog.on_buttonBox_clicked" id="HgStatusDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_buttonBox_clicked" /> + <keyword name="HgStatusDialog.on_commitButton_clicked" id="HgStatusDialog.on_commitButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_commitButton_clicked" /> + <keyword name="HgStatusDialog.on_diffButton_clicked" id="HgStatusDialog.on_diffButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_diffButton_clicked" /> + <keyword name="HgStatusDialog.on_forgetButton_clicked" id="HgStatusDialog.on_forgetButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_forgetButton_clicked" /> <keyword name="HgStatusDialog.on_input_returnPressed" id="HgStatusDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_input_returnPressed" /> <keyword name="HgStatusDialog.on_passwordCheckBox_toggled" id="HgStatusDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_passwordCheckBox_toggled" /> <keyword name="HgStatusDialog.on_refreshButton_clicked" id="HgStatusDialog.on_refreshButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_refreshButton_clicked" /> + <keyword name="HgStatusDialog.on_restoreButton_clicked" id="HgStatusDialog.on_restoreButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_restoreButton_clicked" /> + <keyword name="HgStatusDialog.on_revertButton_clicked" id="HgStatusDialog.on_revertButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_revertButton_clicked" /> <keyword name="HgStatusDialog.on_sendButton_clicked" id="HgStatusDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_sendButton_clicked" /> + <keyword name="HgStatusDialog.on_statusFilterCombo_activated" id="HgStatusDialog.on_statusFilterCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_statusFilterCombo_activated" /> + <keyword name="HgStatusDialog.on_statusList_itemChanged" id="HgStatusDialog.on_statusList_itemChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_statusList_itemChanged" /> + <keyword name="HgStatusDialog.on_statusList_itemSelectionChanged" id="HgStatusDialog.on_statusList_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_statusList_itemSelectionChanged" /> <keyword name="HgStatusDialog.start" id="HgStatusDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.start" /> <keyword name="hg (Module)" id="hg (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html" /> <keyword name="Hg" id="Hg" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg" /> @@ -8633,10 +8647,13 @@ <keyword name="SvnStatusDialog.__breakLock" id="SvnStatusDialog.__breakLock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__breakLock" /> <keyword name="SvnStatusDialog.__commit" id="SvnStatusDialog.__commit" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__commit" /> <keyword name="SvnStatusDialog.__committed" id="SvnStatusDialog.__committed" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__committed" /> + <keyword name="SvnStatusDialog.__diff" id="SvnStatusDialog.__diff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__diff" /> <keyword name="SvnStatusDialog.__finish" id="SvnStatusDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__finish" /> <keyword name="SvnStatusDialog.__generateItem" id="SvnStatusDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__generateItem" /> <keyword name="SvnStatusDialog.__getChangelistItems" id="SvnStatusDialog.__getChangelistItems" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__getChangelistItems" /> + <keyword name="SvnStatusDialog.__getCommitableItems" id="SvnStatusDialog.__getCommitableItems" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__getCommitableItems" /> <keyword name="SvnStatusDialog.__getLockActionItems" id="SvnStatusDialog.__getLockActionItems" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__getLockActionItems" /> + <keyword name="SvnStatusDialog.__getMissingItems" id="SvnStatusDialog.__getMissingItems" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__getMissingItems" /> <keyword name="SvnStatusDialog.__getModifiedItems" id="SvnStatusDialog.__getModifiedItems" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__getModifiedItems" /> <keyword name="SvnStatusDialog.__getNonChangelistItems" id="SvnStatusDialog.__getNonChangelistItems" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__getNonChangelistItems" /> <keyword name="SvnStatusDialog.__getUnversionedItems" id="SvnStatusDialog.__getUnversionedItems" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__getUnversionedItems" /> @@ -8647,17 +8664,28 @@ <keyword name="SvnStatusDialog.__removeFromChangelist" id="SvnStatusDialog.__removeFromChangelist" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__removeFromChangelist" /> <keyword name="SvnStatusDialog.__resizeColumns" id="SvnStatusDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__resizeColumns" /> <keyword name="SvnStatusDialog.__resort" id="SvnStatusDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__resort" /> + <keyword name="SvnStatusDialog.__restoreMissing" id="SvnStatusDialog.__restoreMissing" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__restoreMissing" /> <keyword name="SvnStatusDialog.__revert" id="SvnStatusDialog.__revert" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__revert" /> <keyword name="SvnStatusDialog.__showContextMenu" id="SvnStatusDialog.__showContextMenu" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__showContextMenu" /> <keyword name="SvnStatusDialog.__stealLock" id="SvnStatusDialog.__stealLock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__stealLock" /> <keyword name="SvnStatusDialog.__unlock" id="SvnStatusDialog.__unlock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__unlock" /> + <keyword name="SvnStatusDialog.__updateButtons" id="SvnStatusDialog.__updateButtons" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__updateButtons" /> + <keyword name="SvnStatusDialog.__updateCommitButton" id="SvnStatusDialog.__updateCommitButton" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__updateCommitButton" /> <keyword name="SvnStatusDialog.closeEvent" id="SvnStatusDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.closeEvent" /> <keyword name="SvnStatusDialog.keyPressEvent" id="SvnStatusDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.keyPressEvent" /> + <keyword name="SvnStatusDialog.on_addButton_clicked" id="SvnStatusDialog.on_addButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_addButton_clicked" /> <keyword name="SvnStatusDialog.on_buttonBox_clicked" id="SvnStatusDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_buttonBox_clicked" /> + <keyword name="SvnStatusDialog.on_commitButton_clicked" id="SvnStatusDialog.on_commitButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_commitButton_clicked" /> + <keyword name="SvnStatusDialog.on_diffButton_clicked" id="SvnStatusDialog.on_diffButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_diffButton_clicked" /> <keyword name="SvnStatusDialog.on_input_returnPressed" id="SvnStatusDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_input_returnPressed" /> <keyword name="SvnStatusDialog.on_passwordCheckBox_toggled" id="SvnStatusDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_passwordCheckBox_toggled" /> <keyword name="SvnStatusDialog.on_refreshButton_clicked" id="SvnStatusDialog.on_refreshButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_refreshButton_clicked" /> + <keyword name="SvnStatusDialog.on_restoreButton_clicked" id="SvnStatusDialog.on_restoreButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_restoreButton_clicked" /> + <keyword name="SvnStatusDialog.on_revertButton_clicked" id="SvnStatusDialog.on_revertButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_revertButton_clicked" /> <keyword name="SvnStatusDialog.on_sendButton_clicked" id="SvnStatusDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_sendButton_clicked" /> + <keyword name="SvnStatusDialog.on_statusFilterCombo_activated" id="SvnStatusDialog.on_statusFilterCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_statusFilterCombo_activated" /> + <keyword name="SvnStatusDialog.on_statusList_itemChanged" id="SvnStatusDialog.on_statusList_itemChanged" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_statusList_itemChanged" /> + <keyword name="SvnStatusDialog.on_statusList_itemSelectionChanged" id="SvnStatusDialog.on_statusList_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_statusList_itemSelectionChanged" /> <keyword name="SvnStatusDialog.start" id="SvnStatusDialog.start" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.start" /> <keyword name="subversion (Module)" id="subversion (Module)" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html" /> <keyword name="Subversion" id="Subversion" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion" /> @@ -8999,10 +9027,13 @@ <keyword name="SvnStatusDialog.__breakLock" id="SvnStatusDialog.__breakLock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__breakLock" /> <keyword name="SvnStatusDialog.__commit" id="SvnStatusDialog.__commit" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__commit" /> <keyword name="SvnStatusDialog.__committed" id="SvnStatusDialog.__committed" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__committed" /> + <keyword name="SvnStatusDialog.__diff" id="SvnStatusDialog.__diff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__diff" /> <keyword name="SvnStatusDialog.__finish" id="SvnStatusDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__finish" /> <keyword name="SvnStatusDialog.__generateItem" id="SvnStatusDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__generateItem" /> <keyword name="SvnStatusDialog.__getChangelistItems" id="SvnStatusDialog.__getChangelistItems" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__getChangelistItems" /> + <keyword name="SvnStatusDialog.__getCommitableItems" id="SvnStatusDialog.__getCommitableItems" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__getCommitableItems" /> <keyword name="SvnStatusDialog.__getLockActionItems" id="SvnStatusDialog.__getLockActionItems" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__getLockActionItems" /> + <keyword name="SvnStatusDialog.__getMissingItems" id="SvnStatusDialog.__getMissingItems" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__getMissingItems" /> <keyword name="SvnStatusDialog.__getModifiedItems" id="SvnStatusDialog.__getModifiedItems" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__getModifiedItems" /> <keyword name="SvnStatusDialog.__getNonChangelistItems" id="SvnStatusDialog.__getNonChangelistItems" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__getNonChangelistItems" /> <keyword name="SvnStatusDialog.__getUnversionedItems" id="SvnStatusDialog.__getUnversionedItems" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__getUnversionedItems" /> @@ -9010,13 +9041,24 @@ <keyword name="SvnStatusDialog.__removeFromChangelist" id="SvnStatusDialog.__removeFromChangelist" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__removeFromChangelist" /> <keyword name="SvnStatusDialog.__resizeColumns" id="SvnStatusDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__resizeColumns" /> <keyword name="SvnStatusDialog.__resort" id="SvnStatusDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__resort" /> + <keyword name="SvnStatusDialog.__restoreMissing" id="SvnStatusDialog.__restoreMissing" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__restoreMissing" /> <keyword name="SvnStatusDialog.__revert" id="SvnStatusDialog.__revert" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__revert" /> <keyword name="SvnStatusDialog.__showContextMenu" id="SvnStatusDialog.__showContextMenu" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__showContextMenu" /> <keyword name="SvnStatusDialog.__showError" id="SvnStatusDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__showError" /> <keyword name="SvnStatusDialog.__stealLock" id="SvnStatusDialog.__stealLock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__stealLock" /> <keyword name="SvnStatusDialog.__unlock" id="SvnStatusDialog.__unlock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__unlock" /> + <keyword name="SvnStatusDialog.__updateButtons" id="SvnStatusDialog.__updateButtons" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__updateButtons" /> + <keyword name="SvnStatusDialog.__updateCommitButton" id="SvnStatusDialog.__updateCommitButton" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__updateCommitButton" /> + <keyword name="SvnStatusDialog.on_addButton_clicked" id="SvnStatusDialog.on_addButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_addButton_clicked" /> <keyword name="SvnStatusDialog.on_buttonBox_clicked" id="SvnStatusDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_buttonBox_clicked" /> + <keyword name="SvnStatusDialog.on_commitButton_clicked" id="SvnStatusDialog.on_commitButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_commitButton_clicked" /> + <keyword name="SvnStatusDialog.on_diffButton_clicked" id="SvnStatusDialog.on_diffButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_diffButton_clicked" /> <keyword name="SvnStatusDialog.on_refreshButton_clicked" id="SvnStatusDialog.on_refreshButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_refreshButton_clicked" /> + <keyword name="SvnStatusDialog.on_restoreButton_clicked" id="SvnStatusDialog.on_restoreButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_restoreButton_clicked" /> + <keyword name="SvnStatusDialog.on_revertButton_clicked" id="SvnStatusDialog.on_revertButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_revertButton_clicked" /> + <keyword name="SvnStatusDialog.on_statusFilterCombo_activated" id="SvnStatusDialog.on_statusFilterCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_statusFilterCombo_activated" /> + <keyword name="SvnStatusDialog.on_statusList_itemChanged" id="SvnStatusDialog.on_statusList_itemChanged" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_statusList_itemChanged" /> + <keyword name="SvnStatusDialog.on_statusList_itemSelectionChanged" id="SvnStatusDialog.on_statusList_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_statusList_itemSelectionChanged" /> <keyword name="SvnStatusDialog.start" id="SvnStatusDialog.start" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.start" /> <keyword name="SvnDialogMixin (Module)" id="SvnDialogMixin (Module)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.html" /> <keyword name="SvnDialogMixin" id="SvnDialogMixin" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.html#SvnDialogMixin" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Sat Feb 26 14:28:21 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Sat Feb 26 18:14:12 2011 +0100 @@ -66,6 +66,9 @@ <td><a href="#HgStatusDialog.__committed">__committed</a></td> <td>Private slot called after the commit has finished.</td> </tr><tr> +<td><a href="#HgStatusDialog.__diff">__diff</a></td> +<td>Private slot to handle the Diff context menu entry.</td> +</tr><tr> <td><a href="#HgStatusDialog.__finish">__finish</a></td> <td>Private slot called when the process finished or the user pressed the button.</td> </tr><tr> @@ -75,6 +78,9 @@ <td><a href="#HgStatusDialog.__generateItem">__generateItem</a></td> <td>Private method to generate a status item in the status list.</td> </tr><tr> +<td><a href="#HgStatusDialog.__getCommitableItems">__getCommitableItems</a></td> +<td>Private method to retrieve all entries the user wants to commit.</td> +</tr><tr> <td><a href="#HgStatusDialog.__getMissingItems">__getMissingItems</a></td> <td>Private method to retrieve all entries, that have a missing status.</td> </tr><tr> @@ -99,21 +105,42 @@ <td><a href="#HgStatusDialog.__resort">__resort</a></td> <td>Private method to resort the tree.</td> </tr><tr> +<td><a href="#HgStatusDialog.__restoreMissing">__restoreMissing</a></td> +<td>Private slot to handle the Restore Missing context menu entry.</td> +</tr><tr> <td><a href="#HgStatusDialog.__revert">__revert</a></td> <td>Private slot to handle the Revert context menu entry.</td> </tr><tr> <td><a href="#HgStatusDialog.__showContextMenu">__showContextMenu</a></td> <td>Protected slot to show the context menu of the status list.</td> </tr><tr> +<td><a href="#HgStatusDialog.__updateButtons">__updateButtons</a></td> +<td>Private method to update the VCS buttons status.</td> +</tr><tr> +<td><a href="#HgStatusDialog.__updateCommitButton">__updateCommitButton</a></td> +<td>Private method to update the Commit button status.</td> +</tr><tr> <td><a href="#HgStatusDialog.closeEvent">closeEvent</a></td> <td>Private slot implementing a close event handler.</td> </tr><tr> <td><a href="#HgStatusDialog.keyPressEvent">keyPressEvent</a></td> <td>Protected slot to handle a key press event.</td> </tr><tr> +<td><a href="#HgStatusDialog.on_addButton_clicked">on_addButton_clicked</a></td> +<td>Private slot to handle the press of the Add button.</td> +</tr><tr> <td><a href="#HgStatusDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> <td>Private slot called by a button of the button box clicked.</td> </tr><tr> +<td><a href="#HgStatusDialog.on_commitButton_clicked">on_commitButton_clicked</a></td> +<td>Private slot to handle the press of the Commit button.</td> +</tr><tr> +<td><a href="#HgStatusDialog.on_diffButton_clicked">on_diffButton_clicked</a></td> +<td>Private slot to handle the press of the Differences button.</td> +</tr><tr> +<td><a href="#HgStatusDialog.on_forgetButton_clicked">on_forgetButton_clicked</a></td> +<td>Private slot to handle the press of the Forget button.</td> +</tr><tr> <td><a href="#HgStatusDialog.on_input_returnPressed">on_input_returnPressed</a></td> <td>Private slot to handle the press of the return key in the input field.</td> </tr><tr> @@ -123,9 +150,24 @@ <td><a href="#HgStatusDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> <td>Private slot to refresh the status display.</td> </tr><tr> +<td><a href="#HgStatusDialog.on_restoreButton_clicked">on_restoreButton_clicked</a></td> +<td>Private slot to handle the press of the Restore button.</td> +</tr><tr> +<td><a href="#HgStatusDialog.on_revertButton_clicked">on_revertButton_clicked</a></td> +<td>Private slot to handle the press of the Revert button.</td> +</tr><tr> <td><a href="#HgStatusDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> <td>Private slot to send the input to the subversion process.</td> </tr><tr> +<td><a href="#HgStatusDialog.on_statusFilterCombo_activated">on_statusFilterCombo_activated</a></td> +<td>Private slot to react to the selection of a status filter.</td> +</tr><tr> +<td><a href="#HgStatusDialog.on_statusList_itemChanged">on_statusList_itemChanged</a></td> +<td>Private slot to act upon item changes.</td> +</tr><tr> +<td><a href="#HgStatusDialog.on_statusList_itemSelectionChanged">on_statusList_itemSelectionChanged</a></td> +<td>Private slot to act upon changes of selected items.</td> +</tr><tr> <td><a href="#HgStatusDialog.start">start</a></td> <td>Public slot to start the hg status command.</td> </tr> @@ -158,6 +200,11 @@ <b>__committed</b>(<i></i>) <p> Private slot called after the commit has finished. +</p><a NAME="HgStatusDialog.__diff" ID="HgStatusDialog.__diff"></a> +<h4>HgStatusDialog.__diff</h4> +<b>__diff</b>(<i></i>) +<p> + Private slot to handle the Diff context menu entry. </p><a NAME="HgStatusDialog.__finish" ID="HgStatusDialog.__finish"></a> <h4>HgStatusDialog.__finish</h4> <b>__finish</b>(<i></i>) @@ -181,6 +228,16 @@ <dd> path of the file or directory (string) </dd> +</dl><a NAME="HgStatusDialog.__getCommitableItems" ID="HgStatusDialog.__getCommitableItems"></a> +<h4>HgStatusDialog.__getCommitableItems</h4> +<b>__getCommitableItems</b>(<i></i>) +<p> + Private method to retrieve all entries the user wants to commit. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items, the user has checked +</dd> </dl><a NAME="HgStatusDialog.__getMissingItems" ID="HgStatusDialog.__getMissingItems"></a> <h4>HgStatusDialog.__getMissingItems</h4> <b>__getMissingItems</b>(<i></i>) @@ -250,6 +307,11 @@ <b>__resort</b>(<i></i>) <p> Private method to resort the tree. +</p><a NAME="HgStatusDialog.__restoreMissing" ID="HgStatusDialog.__restoreMissing"></a> +<h4>HgStatusDialog.__restoreMissing</h4> +<b>__restoreMissing</b>(<i></i>) +<p> + Private slot to handle the Restore Missing context menu entry. </p><a NAME="HgStatusDialog.__revert" ID="HgStatusDialog.__revert"></a> <h4>HgStatusDialog.__revert</h4> <b>__revert</b>(<i></i>) @@ -265,7 +327,17 @@ <dd> the position of the mouse pointer (QPoint) </dd> -</dl><a NAME="HgStatusDialog.closeEvent" ID="HgStatusDialog.closeEvent"></a> +</dl><a NAME="HgStatusDialog.__updateButtons" ID="HgStatusDialog.__updateButtons"></a> +<h4>HgStatusDialog.__updateButtons</h4> +<b>__updateButtons</b>(<i></i>) +<p> + Private method to update the VCS buttons status. +</p><a NAME="HgStatusDialog.__updateCommitButton" ID="HgStatusDialog.__updateCommitButton"></a> +<h4>HgStatusDialog.__updateCommitButton</h4> +<b>__updateCommitButton</b>(<i></i>) +<p> + Private method to update the Commit button status. +</p><a NAME="HgStatusDialog.closeEvent" ID="HgStatusDialog.closeEvent"></a> <h4>HgStatusDialog.closeEvent</h4> <b>closeEvent</b>(<i>e</i>) <p> @@ -285,7 +357,12 @@ <dd> the key press event (QKeyEvent) </dd> -</dl><a NAME="HgStatusDialog.on_buttonBox_clicked" ID="HgStatusDialog.on_buttonBox_clicked"></a> +</dl><a NAME="HgStatusDialog.on_addButton_clicked" ID="HgStatusDialog.on_addButton_clicked"></a> +<h4>HgStatusDialog.on_addButton_clicked</h4> +<b>on_addButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Add button. +</p><a NAME="HgStatusDialog.on_buttonBox_clicked" ID="HgStatusDialog.on_buttonBox_clicked"></a> <h4>HgStatusDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) <p> @@ -295,7 +372,22 @@ <dd> button that was clicked (QAbstractButton) </dd> -</dl><a NAME="HgStatusDialog.on_input_returnPressed" ID="HgStatusDialog.on_input_returnPressed"></a> +</dl><a NAME="HgStatusDialog.on_commitButton_clicked" ID="HgStatusDialog.on_commitButton_clicked"></a> +<h4>HgStatusDialog.on_commitButton_clicked</h4> +<b>on_commitButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Commit button. +</p><a NAME="HgStatusDialog.on_diffButton_clicked" ID="HgStatusDialog.on_diffButton_clicked"></a> +<h4>HgStatusDialog.on_diffButton_clicked</h4> +<b>on_diffButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Differences button. +</p><a NAME="HgStatusDialog.on_forgetButton_clicked" ID="HgStatusDialog.on_forgetButton_clicked"></a> +<h4>HgStatusDialog.on_forgetButton_clicked</h4> +<b>on_forgetButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Forget button. +</p><a NAME="HgStatusDialog.on_input_returnPressed" ID="HgStatusDialog.on_input_returnPressed"></a> <h4>HgStatusDialog.on_input_returnPressed</h4> <b>on_input_returnPressed</b>(<i></i>) <p> @@ -315,11 +407,49 @@ <b>on_refreshButton_clicked</b>(<i></i>) <p> Private slot to refresh the status display. +</p><a NAME="HgStatusDialog.on_restoreButton_clicked" ID="HgStatusDialog.on_restoreButton_clicked"></a> +<h4>HgStatusDialog.on_restoreButton_clicked</h4> +<b>on_restoreButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Restore button. +</p><a NAME="HgStatusDialog.on_revertButton_clicked" ID="HgStatusDialog.on_revertButton_clicked"></a> +<h4>HgStatusDialog.on_revertButton_clicked</h4> +<b>on_revertButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Revert button. </p><a NAME="HgStatusDialog.on_sendButton_clicked" ID="HgStatusDialog.on_sendButton_clicked"></a> <h4>HgStatusDialog.on_sendButton_clicked</h4> <b>on_sendButton_clicked</b>(<i></i>) <p> Private slot to send the input to the subversion process. +</p><a NAME="HgStatusDialog.on_statusFilterCombo_activated" ID="HgStatusDialog.on_statusFilterCombo_activated"></a> +<h4>HgStatusDialog.on_statusFilterCombo_activated</h4> +<b>on_statusFilterCombo_activated</b>(<i>txt</i>) +<p> + Private slot to react to the selection of a status filter. +</p><dl> +<dt><i>txt</i></dt> +<dd> +selected status filter (string) +</dd> +</dl><a NAME="HgStatusDialog.on_statusList_itemChanged" ID="HgStatusDialog.on_statusList_itemChanged"></a> +<h4>HgStatusDialog.on_statusList_itemChanged</h4> +<b>on_statusList_itemChanged</b>(<i>item, column</i>) +<p> + Private slot to act upon item changes. +</p><dl> +<dt><i>item</i></dt> +<dd> +reference to the changed item (QTreeWidgetItem) +</dd><dt><i>column</i></dt> +<dd> +index of column that changed (integer) +</dd> +</dl><a NAME="HgStatusDialog.on_statusList_itemSelectionChanged" ID="HgStatusDialog.on_statusList_itemSelectionChanged"></a> +<h4>HgStatusDialog.on_statusList_itemSelectionChanged</h4> +<b>on_statusList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to act upon changes of selected items. </p><a NAME="HgStatusDialog.start" ID="HgStatusDialog.start"></a> <h4>HgStatusDialog.start</h4> <b>start</b>(<i>fn</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html Sat Feb 26 14:28:21 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html Sat Feb 26 18:14:12 2011 +0100 @@ -74,6 +74,9 @@ <td><a href="#SvnStatusDialog.__committed">__committed</a></td> <td>Private slot called after the commit has finished.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__diff">__diff</a></td> +<td>Private slot to handle the Diff context menu entry.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__finish">__finish</a></td> <td>Private slot called when the process finished or the user pressed the button.</td> </tr><tr> @@ -83,9 +86,15 @@ <td><a href="#SvnStatusDialog.__getChangelistItems">__getChangelistItems</a></td> <td>Private method to retrieve all entries, that are members of a changelist.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__getCommitableItems">__getCommitableItems</a></td> +<td>Private method to retrieve all entries the user wants to commit.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__getLockActionItems">__getLockActionItems</a></td> <td>Private method to retrieve all entries, that have a locked status.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__getMissingItems">__getMissingItems</a></td> +<td>Private method to retrieve all entries, that have a missing status.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__getModifiedItems">__getModifiedItems</a></td> <td>Private method to retrieve all entries, that have a modified status.</td> </tr><tr> @@ -107,6 +116,9 @@ <td><a href="#SvnStatusDialog.__resort">__resort</a></td> <td>Private method to resort the tree.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__restoreMissing">__restoreMissing</a></td> +<td>Private slot to handle the Restore Missing context menu entry.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__revert">__revert</a></td> <td>Private slot to handle the Revert context menu entry.</td> </tr><tr> @@ -122,12 +134,42 @@ <td><a href="#SvnStatusDialog.__unlock">__unlock</a></td> <td>Private slot to handle the Unlock context menu entry.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__updateButtons">__updateButtons</a></td> +<td>Private method to update the VCS buttons status.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.__updateCommitButton">__updateCommitButton</a></td> +<td>Private method to update the Commit button status.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_addButton_clicked">on_addButton_clicked</a></td> +<td>Private slot to handle the press of the Add button.</td> +</tr><tr> <td><a href="#SvnStatusDialog.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="#SvnStatusDialog.on_commitButton_clicked">on_commitButton_clicked</a></td> +<td>Private slot to handle the press of the Commit button.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_diffButton_clicked">on_diffButton_clicked</a></td> +<td>Private slot to handle the press of the Differences button.</td> +</tr><tr> <td><a href="#SvnStatusDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> <td>Private slot to refresh the status display.</td> </tr><tr> +<td><a href="#SvnStatusDialog.on_restoreButton_clicked">on_restoreButton_clicked</a></td> +<td>Private slot to handle the press of the Restore button.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_revertButton_clicked">on_revertButton_clicked</a></td> +<td>Private slot to handle the press of the Revert button.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_statusFilterCombo_activated">on_statusFilterCombo_activated</a></td> +<td>Private slot to react to the selection of a status filter.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_statusList_itemChanged">on_statusList_itemChanged</a></td> +<td>Private slot to act upon item changes.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_statusList_itemSelectionChanged">on_statusList_itemSelectionChanged</a></td> +<td>Private slot to act upon changes of selected items.</td> +</tr><tr> <td><a href="#SvnStatusDialog.start">start</a></td> <td>Public slot to start the svn status command.</td> </tr> @@ -170,6 +212,11 @@ <b>__committed</b>(<i></i>) <p> Private slot called after the commit has finished. +</p><a NAME="SvnStatusDialog.__diff" ID="SvnStatusDialog.__diff"></a> +<h4>SvnStatusDialog.__diff</h4> +<b>__diff</b>(<i></i>) +<p> + Private slot to handle the Diff context menu entry. </p><a NAME="SvnStatusDialog.__finish" ID="SvnStatusDialog.__finish"></a> <h4>SvnStatusDialog.__finish</h4> <b>__finish</b>(<i></i>) @@ -230,6 +277,16 @@ <dd> list of all items belonging to a changelist </dd> +</dl><a NAME="SvnStatusDialog.__getCommitableItems" ID="SvnStatusDialog.__getCommitableItems"></a> +<h4>SvnStatusDialog.__getCommitableItems</h4> +<b>__getCommitableItems</b>(<i></i>) +<p> + Private method to retrieve all entries the user wants to commit. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items, the user has checked +</dd> </dl><a NAME="SvnStatusDialog.__getLockActionItems" ID="SvnStatusDialog.__getLockActionItems"></a> <h4>SvnStatusDialog.__getLockActionItems</h4> <b>__getLockActionItems</b>(<i>indicators</i>) @@ -240,6 +297,16 @@ <dd> list of all items with a locked status </dd> +</dl><a NAME="SvnStatusDialog.__getMissingItems" ID="SvnStatusDialog.__getMissingItems"></a> +<h4>SvnStatusDialog.__getMissingItems</h4> +<b>__getMissingItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have a missing status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with a missing status +</dd> </dl><a NAME="SvnStatusDialog.__getModifiedItems" ID="SvnStatusDialog.__getModifiedItems"></a> <h4>SvnStatusDialog.__getModifiedItems</h4> <b>__getModifiedItems</b>(<i></i>) @@ -292,6 +359,11 @@ <b>__resort</b>(<i></i>) <p> Private method to resort the tree. +</p><a NAME="SvnStatusDialog.__restoreMissing" ID="SvnStatusDialog.__restoreMissing"></a> +<h4>SvnStatusDialog.__restoreMissing</h4> +<b>__restoreMissing</b>(<i></i>) +<p> + Private slot to handle the Restore Missing context menu entry. </p><a NAME="SvnStatusDialog.__revert" ID="SvnStatusDialog.__revert"></a> <h4>SvnStatusDialog.__revert</h4> <b>__revert</b>(<i></i>) @@ -327,6 +399,21 @@ <b>__unlock</b>(<i></i>) <p> Private slot to handle the Unlock context menu entry. +</p><a NAME="SvnStatusDialog.__updateButtons" ID="SvnStatusDialog.__updateButtons"></a> +<h4>SvnStatusDialog.__updateButtons</h4> +<b>__updateButtons</b>(<i></i>) +<p> + Private method to update the VCS buttons status. +</p><a NAME="SvnStatusDialog.__updateCommitButton" ID="SvnStatusDialog.__updateCommitButton"></a> +<h4>SvnStatusDialog.__updateCommitButton</h4> +<b>__updateCommitButton</b>(<i></i>) +<p> + Private method to update the Commit button status. +</p><a NAME="SvnStatusDialog.on_addButton_clicked" ID="SvnStatusDialog.on_addButton_clicked"></a> +<h4>SvnStatusDialog.on_addButton_clicked</h4> +<b>on_addButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Add button. </p><a NAME="SvnStatusDialog.on_buttonBox_clicked" ID="SvnStatusDialog.on_buttonBox_clicked"></a> <h4>SvnStatusDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) @@ -337,11 +424,59 @@ <dd> button that was clicked (QAbstractButton) </dd> -</dl><a NAME="SvnStatusDialog.on_refreshButton_clicked" ID="SvnStatusDialog.on_refreshButton_clicked"></a> +</dl><a NAME="SvnStatusDialog.on_commitButton_clicked" ID="SvnStatusDialog.on_commitButton_clicked"></a> +<h4>SvnStatusDialog.on_commitButton_clicked</h4> +<b>on_commitButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Commit button. +</p><a NAME="SvnStatusDialog.on_diffButton_clicked" ID="SvnStatusDialog.on_diffButton_clicked"></a> +<h4>SvnStatusDialog.on_diffButton_clicked</h4> +<b>on_diffButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Differences button. +</p><a NAME="SvnStatusDialog.on_refreshButton_clicked" ID="SvnStatusDialog.on_refreshButton_clicked"></a> <h4>SvnStatusDialog.on_refreshButton_clicked</h4> <b>on_refreshButton_clicked</b>(<i></i>) <p> Private slot to refresh the status display. +</p><a NAME="SvnStatusDialog.on_restoreButton_clicked" ID="SvnStatusDialog.on_restoreButton_clicked"></a> +<h4>SvnStatusDialog.on_restoreButton_clicked</h4> +<b>on_restoreButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Restore button. +</p><a NAME="SvnStatusDialog.on_revertButton_clicked" ID="SvnStatusDialog.on_revertButton_clicked"></a> +<h4>SvnStatusDialog.on_revertButton_clicked</h4> +<b>on_revertButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Revert button. +</p><a NAME="SvnStatusDialog.on_statusFilterCombo_activated" ID="SvnStatusDialog.on_statusFilterCombo_activated"></a> +<h4>SvnStatusDialog.on_statusFilterCombo_activated</h4> +<b>on_statusFilterCombo_activated</b>(<i>txt</i>) +<p> + Private slot to react to the selection of a status filter. +</p><dl> +<dt><i>txt</i></dt> +<dd> +selected status filter (string) +</dd> +</dl><a NAME="SvnStatusDialog.on_statusList_itemChanged" ID="SvnStatusDialog.on_statusList_itemChanged"></a> +<h4>SvnStatusDialog.on_statusList_itemChanged</h4> +<b>on_statusList_itemChanged</b>(<i>item, column</i>) +<p> + Private slot to act upon item changes. +</p><dl> +<dt><i>item</i></dt> +<dd> +reference to the changed item (QTreeWidgetItem) +</dd><dt><i>column</i></dt> +<dd> +index of column that changed (integer) +</dd> +</dl><a NAME="SvnStatusDialog.on_statusList_itemSelectionChanged" ID="SvnStatusDialog.on_statusList_itemSelectionChanged"></a> +<h4>SvnStatusDialog.on_statusList_itemSelectionChanged</h4> +<b>on_statusList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to act upon changes of selected items. </p><a NAME="SvnStatusDialog.start" ID="SvnStatusDialog.start"></a> <h4>SvnStatusDialog.start</h4> <b>start</b>(<i>fn</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html Sat Feb 26 14:28:21 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html Sat Feb 26 18:14:12 2011 +0100 @@ -74,6 +74,9 @@ <td><a href="#SvnStatusDialog.__committed">__committed</a></td> <td>Private slot called after the commit has finished.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__diff">__diff</a></td> +<td>Private slot to handle the Diff context menu entry.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__finish">__finish</a></td> <td>Private slot called when the process finished or the user pressed the button.</td> </tr><tr> @@ -83,9 +86,15 @@ <td><a href="#SvnStatusDialog.__getChangelistItems">__getChangelistItems</a></td> <td>Private method to retrieve all entries, that are members of a changelist.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__getCommitableItems">__getCommitableItems</a></td> +<td>Private method to retrieve all entries the user wants to commit.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__getLockActionItems">__getLockActionItems</a></td> <td>Private method to retrieve all emtries, that have a locked status.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__getMissingItems">__getMissingItems</a></td> +<td>Private method to retrieve all entries, that have a missing status.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__getModifiedItems">__getModifiedItems</a></td> <td>Private method to retrieve all entries, that have a modified status.</td> </tr><tr> @@ -116,6 +125,9 @@ <td><a href="#SvnStatusDialog.__resort">__resort</a></td> <td>Private method to resort the tree.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__restoreMissing">__restoreMissing</a></td> +<td>Private slot to handle the Restore Missing context menu entry.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__revert">__revert</a></td> <td>Private slot to handle the Revert context menu entry.</td> </tr><tr> @@ -128,15 +140,30 @@ <td><a href="#SvnStatusDialog.__unlock">__unlock</a></td> <td>Private slot to handle the Unlock context menu entry.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__updateButtons">__updateButtons</a></td> +<td>Private method to update the VCS buttons status.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.__updateCommitButton">__updateCommitButton</a></td> +<td>Private method to update the Commit button status.</td> +</tr><tr> <td><a href="#SvnStatusDialog.closeEvent">closeEvent</a></td> <td>Private slot implementing a close event handler.</td> </tr><tr> <td><a href="#SvnStatusDialog.keyPressEvent">keyPressEvent</a></td> <td>Protected slot to handle a key press event.</td> </tr><tr> +<td><a href="#SvnStatusDialog.on_addButton_clicked">on_addButton_clicked</a></td> +<td>Private slot to handle the press of the Add button.</td> +</tr><tr> <td><a href="#SvnStatusDialog.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="#SvnStatusDialog.on_commitButton_clicked">on_commitButton_clicked</a></td> +<td>Private slot to handle the press of the Commit button.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_diffButton_clicked">on_diffButton_clicked</a></td> +<td>Private slot to handle the press of the Differences button.</td> +</tr><tr> <td><a href="#SvnStatusDialog.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> @@ -146,9 +173,24 @@ <td><a href="#SvnStatusDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> <td>Private slot to refresh the status display.</td> </tr><tr> +<td><a href="#SvnStatusDialog.on_restoreButton_clicked">on_restoreButton_clicked</a></td> +<td>Private slot to handle the press of the Restore button.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_revertButton_clicked">on_revertButton_clicked</a></td> +<td>Private slot to handle the press of the Revert button.</td> +</tr><tr> <td><a href="#SvnStatusDialog.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="#SvnStatusDialog.on_statusFilterCombo_activated">on_statusFilterCombo_activated</a></td> +<td>Private slot to react to the selection of a status filter.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_statusList_itemChanged">on_statusList_itemChanged</a></td> +<td>Private slot to act upon item changes.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.on_statusList_itemSelectionChanged">on_statusList_itemSelectionChanged</a></td> +<td>Private slot to act upon changes of selected items.</td> +</tr><tr> <td><a href="#SvnStatusDialog.start">start</a></td> <td>Public slot to start the svn status command.</td> </tr> @@ -191,6 +233,11 @@ <b>__committed</b>(<i></i>) <p> Private slot called after the commit has finished. +</p><a NAME="SvnStatusDialog.__diff" ID="SvnStatusDialog.__diff"></a> +<h4>SvnStatusDialog.__diff</h4> +<b>__diff</b>(<i></i>) +<p> + Private slot to handle the Diff context menu entry. </p><a NAME="SvnStatusDialog.__finish" ID="SvnStatusDialog.__finish"></a> <h4>SvnStatusDialog.__finish</h4> <b>__finish</b>(<i></i>) @@ -248,6 +295,16 @@ <dd> list of all items belonging to a changelist </dd> +</dl><a NAME="SvnStatusDialog.__getCommitableItems" ID="SvnStatusDialog.__getCommitableItems"></a> +<h4>SvnStatusDialog.__getCommitableItems</h4> +<b>__getCommitableItems</b>(<i></i>) +<p> + Private method to retrieve all entries the user wants to commit. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items, the user has checked +</dd> </dl><a NAME="SvnStatusDialog.__getLockActionItems" ID="SvnStatusDialog.__getLockActionItems"></a> <h4>SvnStatusDialog.__getLockActionItems</h4> <b>__getLockActionItems</b>(<i>indicators</i>) @@ -258,6 +315,16 @@ <dd> list of all items with a locked status </dd> +</dl><a NAME="SvnStatusDialog.__getMissingItems" ID="SvnStatusDialog.__getMissingItems"></a> +<h4>SvnStatusDialog.__getMissingItems</h4> +<b>__getMissingItems</b>(<i></i>) +<p> + Private method to retrieve all entries, that have a missing status. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all items with a missing status +</dd> </dl><a NAME="SvnStatusDialog.__getModifiedItems" ID="SvnStatusDialog.__getModifiedItems"></a> <h4>SvnStatusDialog.__getModifiedItems</h4> <b>__getModifiedItems</b>(<i></i>) @@ -339,6 +406,11 @@ <b>__resort</b>(<i></i>) <p> Private method to resort the tree. +</p><a NAME="SvnStatusDialog.__restoreMissing" ID="SvnStatusDialog.__restoreMissing"></a> +<h4>SvnStatusDialog.__restoreMissing</h4> +<b>__restoreMissing</b>(<i></i>) +<p> + Private slot to handle the Restore Missing context menu entry. </p><a NAME="SvnStatusDialog.__revert" ID="SvnStatusDialog.__revert"></a> <h4>SvnStatusDialog.__revert</h4> <b>__revert</b>(<i></i>) @@ -364,6 +436,16 @@ <b>__unlock</b>(<i></i>) <p> Private slot to handle the Unlock context menu entry. +</p><a NAME="SvnStatusDialog.__updateButtons" ID="SvnStatusDialog.__updateButtons"></a> +<h4>SvnStatusDialog.__updateButtons</h4> +<b>__updateButtons</b>(<i></i>) +<p> + Private method to update the VCS buttons status. +</p><a NAME="SvnStatusDialog.__updateCommitButton" ID="SvnStatusDialog.__updateCommitButton"></a> +<h4>SvnStatusDialog.__updateCommitButton</h4> +<b>__updateCommitButton</b>(<i></i>) +<p> + Private method to update the Commit button status. </p><a NAME="SvnStatusDialog.closeEvent" ID="SvnStatusDialog.closeEvent"></a> <h4>SvnStatusDialog.closeEvent</h4> <b>closeEvent</b>(<i>e</i>) @@ -384,7 +466,12 @@ <dd> the key press event (QKeyEvent) </dd> -</dl><a NAME="SvnStatusDialog.on_buttonBox_clicked" ID="SvnStatusDialog.on_buttonBox_clicked"></a> +</dl><a NAME="SvnStatusDialog.on_addButton_clicked" ID="SvnStatusDialog.on_addButton_clicked"></a> +<h4>SvnStatusDialog.on_addButton_clicked</h4> +<b>on_addButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Add button. +</p><a NAME="SvnStatusDialog.on_buttonBox_clicked" ID="SvnStatusDialog.on_buttonBox_clicked"></a> <h4>SvnStatusDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) <p> @@ -394,7 +481,17 @@ <dd> button that was clicked (QAbstractButton) </dd> -</dl><a NAME="SvnStatusDialog.on_input_returnPressed" ID="SvnStatusDialog.on_input_returnPressed"></a> +</dl><a NAME="SvnStatusDialog.on_commitButton_clicked" ID="SvnStatusDialog.on_commitButton_clicked"></a> +<h4>SvnStatusDialog.on_commitButton_clicked</h4> +<b>on_commitButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Commit button. +</p><a NAME="SvnStatusDialog.on_diffButton_clicked" ID="SvnStatusDialog.on_diffButton_clicked"></a> +<h4>SvnStatusDialog.on_diffButton_clicked</h4> +<b>on_diffButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Differences button. +</p><a NAME="SvnStatusDialog.on_input_returnPressed" ID="SvnStatusDialog.on_input_returnPressed"></a> <h4>SvnStatusDialog.on_input_returnPressed</h4> <b>on_input_returnPressed</b>(<i></i>) <p> @@ -414,11 +511,49 @@ <b>on_refreshButton_clicked</b>(<i></i>) <p> Private slot to refresh the status display. +</p><a NAME="SvnStatusDialog.on_restoreButton_clicked" ID="SvnStatusDialog.on_restoreButton_clicked"></a> +<h4>SvnStatusDialog.on_restoreButton_clicked</h4> +<b>on_restoreButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Restore button. +</p><a NAME="SvnStatusDialog.on_revertButton_clicked" ID="SvnStatusDialog.on_revertButton_clicked"></a> +<h4>SvnStatusDialog.on_revertButton_clicked</h4> +<b>on_revertButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Revert button. </p><a NAME="SvnStatusDialog.on_sendButton_clicked" ID="SvnStatusDialog.on_sendButton_clicked"></a> <h4>SvnStatusDialog.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="SvnStatusDialog.on_statusFilterCombo_activated" ID="SvnStatusDialog.on_statusFilterCombo_activated"></a> +<h4>SvnStatusDialog.on_statusFilterCombo_activated</h4> +<b>on_statusFilterCombo_activated</b>(<i>txt</i>) +<p> + Private slot to react to the selection of a status filter. +</p><dl> +<dt><i>txt</i></dt> +<dd> +selected status filter (string) +</dd> +</dl><a NAME="SvnStatusDialog.on_statusList_itemChanged" ID="SvnStatusDialog.on_statusList_itemChanged"></a> +<h4>SvnStatusDialog.on_statusList_itemChanged</h4> +<b>on_statusList_itemChanged</b>(<i>item, column</i>) +<p> + Private slot to act upon item changes. +</p><dl> +<dt><i>item</i></dt> +<dd> +reference to the changed item (QTreeWidgetItem) +</dd><dt><i>column</i></dt> +<dd> +index of column that changed (integer) +</dd> +</dl><a NAME="SvnStatusDialog.on_statusList_itemSelectionChanged" ID="SvnStatusDialog.on_statusList_itemSelectionChanged"></a> +<h4>SvnStatusDialog.on_statusList_itemSelectionChanged</h4> +<b>on_statusList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to act upon changes of selected items. </p><a NAME="SvnStatusDialog.start" ID="SvnStatusDialog.start"></a> <h4>SvnStatusDialog.start</h4> <b>start</b>(<i>fn</i>)
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Feb 26 14:28:21 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Feb 26 18:14:12 2011 +0100 @@ -16,6 +16,8 @@ from E5Gui.E5Application import e5App from E5Gui import E5MessageBox +from .HgDiffDialog import HgDiffDialog + from .Ui_HgStatusDialog import Ui_HgStatusDialog import Preferences @@ -34,8 +36,9 @@ QWidget.__init__(self, parent) self.setupUi(self) - self.__statusColumn = 0 - self.__pathColumn = 1 + self.__toBeCommittedColumn = 0 + self.__statusColumn = 1 + self.__pathColumn = 2 self.__lastColumn = self.statusList.columnCount() self.refreshButton = \ @@ -45,6 +48,7 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + self.diff = None self.process = None self.vcs = vcs self.vcs.committed.connect(self.__committed) @@ -60,9 +64,13 @@ self.menuactions.append(self.menu.addAction( self.trUtf8("Add to repository"), self.__add)) self.menuactions.append(self.menu.addAction( + self.trUtf8("Show differences"), self.__diff)) + self.menuactions.append(self.menu.addAction( self.trUtf8("Remove from repository"), self.__forget)) self.menuactions.append(self.menu.addAction( self.trUtf8("Revert changes"), self.__revert)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Restore missing"), self.__restoreMissing)) self.menu.addSeparator() self.menuactions.append(self.menu.addAction(self.trUtf8("Adjust column sizes"), self.__resizeColumns)) @@ -117,14 +125,22 @@ @param status status indicator (string) @param path path of the file or directory (string) """ + statusText = self.status[status] itm = QTreeWidgetItem(self.statusList, [ - self.status[status], + "", + statusText, path, ]) - itm.setTextAlignment(0, Qt.AlignHCenter) - itm.setTextAlignment(1, Qt.AlignLeft) + itm.setTextAlignment(1, Qt.AlignHCenter) + itm.setTextAlignment(2, Qt.AlignLeft) + if status in "AMR": + itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + + if statusText not in self.__statusFilters: + self.__statusFilters.append(statusText) + def closeEvent(self, e): """ Private slot implementing a close event handler. @@ -150,6 +166,19 @@ self.intercept = False self.args = fn + for act in self.menuactions: + act.setEnabled(False) + + self.addButton.setEnabled(False) + self.commitButton.setEnabled(False) + self.diffButton.setEnabled(False) + self.revertButton.setEnabled(False) + self.forgetButton.setEnabled(False) + self.restoreButton.setEnabled(False) + + self.statusFilterCombo.clear() + self.__statusFilters = [] + if self.process: self.process.kill() else: @@ -215,6 +244,10 @@ self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + self.__statusFilters.sort() + self.__statusFilters.insert(0, "<{0}>".format(self.trUtf8("all"))) + self.statusFilterCombo.addItems(self.__statusFilters) + for act in self.menuactions: act.setEnabled(True) @@ -223,6 +256,9 @@ self.statusList.doItemsLayout() self.__resort() self.__resizeColumns() + + self.__updateButtons() + self.__updateCommitButton() def on_buttonBox_clicked(self, button): """ @@ -342,13 +378,107 @@ self.inputGroup.show() self.refreshButton.setEnabled(False) - for act in self.menuactions: - act.setEnabled(False) - self.statusList.clear() self.start(self.args) + def __updateButtons(self): + """ + Private method to update the VCS buttons status. + """ + modified = len(self.__getModifiedItems()) + unversioned = len(self.__getUnversionedItems()) + missing = len(self.__getMissingItems()) + + self.addButton.setEnabled(unversioned) + self.diffButton.setEnabled(modified) + self.revertButton.setEnabled(modified) + self.forgetButton.setEnabled(missing) + self.restoreButton.setEnabled(missing) + + def __updateCommitButton(self): + """ + Private method to update the Commit button status. + """ + commitable = len(self.__getCommitableItems()) + self.commitButton.setEnabled(commitable) + + @pyqtSlot(str) + def on_statusFilterCombo_activated(self, txt): + """ + Private slot to react to the selection of a status filter. + + @param txt selected status filter (string) + """ + if txt == "<{0}>".format(self.trUtf8("all")): + for topIndex in range(self.statusList.topLevelItemCount()): + topItem = self.statusList.topLevelItem(topIndex) + topItem.setHidden(False) + else: + for topIndex in range(self.statusList.topLevelItemCount()): + topItem = self.statusList.topLevelItem(topIndex) + topItem.setHidden(topItem.text(self.__statusColumn) != txt) + + @pyqtSlot(QTreeWidgetItem, int) + def on_statusList_itemChanged(self, item, column): + """ + Private slot to act upon item changes. + + @param item reference to the changed item (QTreeWidgetItem) + @param column index of column that changed (integer) + """ + if column == self.__toBeCommittedColumn: + self.__updateCommitButton() + + @pyqtSlot() + def on_statusList_itemSelectionChanged(self): + """ + Private slot to act upon changes of selected items. + """ + self.__updateButtons() + + @pyqtSlot() + def on_commitButton_clicked(self): + """ + Private slot to handle the press of the Commit button. + """ + self.__commit() + + @pyqtSlot() + def on_addButton_clicked(self): + """ + Private slot to handle the press of the Add button. + """ + self.__add() + + @pyqtSlot() + def on_diffButton_clicked(self): + """ + Private slot to handle the press of the Differences button. + """ + self.__diff() + + @pyqtSlot() + def on_revertButton_clicked(self): + """ + Private slot to handle the press of the Revert button. + """ + self.__revert() + + @pyqtSlot() + def on_forgetButton_clicked(self): + """ + Private slot to handle the press of the Forget button. + """ + self.__forget() + + @pyqtSlot() + def on_restoreButton_clicked(self): + """ + Private slot to handle the press of the Restore button. + """ + self.__restoreMissing() + ############################################################################ ## Context menu handling methods ############################################################################ @@ -366,11 +496,12 @@ Private slot to handle the Commit context menu entry. """ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ - for itm in self.__getModifiedItems()] + for itm in self.__getCommitableItems()] if not names: E5MessageBox.information(self, self.trUtf8("Commit"), - self.trUtf8("""There are no uncommitted changes available/selected.""")) + self.trUtf8("""There are no entries selected to be""" + """ committed.""")) return if Preferences.getVCS("AutoSaveFiles"): @@ -396,7 +527,8 @@ if not names: E5MessageBox.information(self, self.trUtf8("Add"), - self.trUtf8("""There are no unversioned entries available/selected.""")) + self.trUtf8("""There are no unversioned entries""" + """ available/selected.""")) return self.vcs.vcsAdd(names) @@ -416,7 +548,8 @@ if not names: E5MessageBox.information(self, self.trUtf8("Remove"), - self.trUtf8("""There are no missing entries available/selected.""")) + self.trUtf8("""There are no missing entries""" + """ available/selected.""")) return self.vcs.hgForget(names) @@ -431,7 +564,8 @@ if not names: E5MessageBox.information(self, self.trUtf8("Revert"), - self.trUtf8("""There are no uncommitted changes available/selected.""")) + self.trUtf8("""There are no uncommitted changes""" + """ available/selected.""")) return self.vcs.vcsRevert(names) @@ -442,6 +576,54 @@ project.getModel().updateVCSStatus(name) self.vcs.checkVCSStatus() + def __restoreMissing(self): + """ + Private slot to handle the Restore Missing context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getMissingItems()] + if not names: + E5MessageBox.information(self, + self.trUtf8("Revert"), + self.trUtf8("""There are no missing entries""" + """ available/selected.""")) + return + + self.vcs.vcsRevert(names) + self.on_refreshButton_clicked() + self.vcs.checkVCSStatus() + + def __diff(self): + """ + Private slot to handle the Diff context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getModifiedItems()] + if not names: + E5MessageBox.information(self, + self.trUtf8("Differences"), + self.trUtf8("""There are no uncommitted changes""" + """ available/selected.""")) + return + + if self.diff is None: + self.diff = HgDiffDialog(self.vcs) + self.diff.show() + self.diff.start(names) + + def __getCommitableItems(self): + """ + Private method to retrieve all entries the user wants to commit. + + @return list of all items, the user has checked + """ + commitableItems = [] + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.checkState(self.__toBeCommittedColumn) == Qt.Checked: + commitableItems.append(itm) + return commitableItems + def __getModifiedItems(self): """ Private method to retrieve all entries, that have a modified status. @@ -476,4 +658,4 @@ for itm in self.statusList.selectedItems(): if itm.text(self.__statusColumn) in self.missingIndicators: missingItems.append(itm) - return missingItems \ No newline at end of file + return missingItems
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui Sat Feb 26 14:28:21 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui Sat Feb 26 18:14:12 2011 +0100 @@ -17,7 +17,44 @@ <string><b>Mercurial Status</b> <p>This dialog shows the status of the selected file or project.</p></string> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>&Filter on Status:</string> + </property> + <property name="buddy"> + <cstring>statusFilterCombo</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="statusFilterCombo"> + <property name="toolTip"> + <string>Select the status of entries to be shown</string> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToContents</enum> + </property> + </widget> + </item> + </layout> + </item> <item> <widget class="QTreeWidget" name="statusList"> <property name="sizePolicy"> @@ -26,9 +63,6 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> <property name="alternatingRowColors"> <bool>true</bool> </property> @@ -43,6 +77,11 @@ </property> <column> <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> <string>Status</string> </property> </column> @@ -54,6 +93,90 @@ </widget> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="commitButton"> + <property name="toolTip"> + <string>Commit the selected changes</string> + </property> + <property name="text"> + <string>&Commit</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> + <string>Add the selected entries to the repository</string> + </property> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="diffButton"> + <property name="toolTip"> + <string>Show differences of the selected entries to the repository</string> + </property> + <property name="text"> + <string>&Differences</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="revertButton"> + <property name="toolTip"> + <string>Revert the selected entries to the last revision in the repository</string> + </property> + <property name="text"> + <string>Re&vert</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="forgetButton"> + <property name="toolTip"> + <string>Forget about the selected missing entries</string> + </property> + <property name="text"> + <string>For&get</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="restoreButton"> + <property name="toolTip"> + <string>Restore the selected missing entries from the repository</string> + </property> + <property name="text"> + <string>&Restore</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> <widget class="QGroupBox" name="errorGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> @@ -154,9 +277,18 @@ <layoutdefault spacing="6" margin="11"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> + <tabstop>statusFilterCombo</tabstop> + <tabstop>statusList</tabstop> + <tabstop>commitButton</tabstop> + <tabstop>addButton</tabstop> + <tabstop>diffButton</tabstop> + <tabstop>revertButton</tabstop> + <tabstop>forgetButton</tabstop> + <tabstop>restoreButton</tabstop> <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> <tabstop>sendButton</tabstop> - <tabstop>passwordCheckBox</tabstop> + <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat Feb 26 14:28:21 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat Feb 26 18:14:12 2011 +0100 @@ -20,6 +20,8 @@ from .SvnConst import svnStatusMap from .SvnDialogMixin import SvnDialogMixin +from .SvnDiffDialog import SvnDiffDialog + from .Ui_SvnStatusDialog import Ui_SvnStatusDialog import Preferences @@ -40,15 +42,16 @@ self.setupUi(self) SvnDialogMixin.__init__(self) - self.__changelistColumn = 0 - self.__statusColumn = 1 - self.__propStatusColumn = 2 - self.__lockedColumn = 3 - self.__historyColumn = 4 - self.__switchedColumn = 5 - self.__lockinfoColumn = 6 - self.__upToDateColumn = 7 - self.__pathColumn = 11 + self.__toBeCommittedColumn = 0 + self.__changelistColumn = 1 + self.__statusColumn = 2 + self.__propStatusColumn = 3 + self.__lockedColumn = 4 + self.__historyColumn = 5 + self.__switchedColumn = 6 + self.__lockinfoColumn = 7 + self.__upToDateColumn = 8 + self.__pathColumn = 12 self.__lastColumn = self.statusList.columnCount() self.refreshButton = \ @@ -60,6 +63,7 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + self.diff = None self.vcs = vcs self.vcs.committed.connect(self.__committed) @@ -77,7 +81,11 @@ self.menuactions.append(self.menu.addAction( self.trUtf8("Add to repository"), self.__add)) self.menuactions.append(self.menu.addAction( + self.trUtf8("Show differences"), self.__diff)) + self.menuactions.append(self.menu.addAction( self.trUtf8("Revert changes"), self.__revert)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Restore missing"), self.__restoreMissing)) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): self.menu.addSeparator() self.menuactions.append(self.menu.addAction( @@ -114,22 +122,26 @@ self.trUtf8(svnStatusMap[pysvn.wc_status_kind.modified]) ] + self.missingIndicators = [ + self.trUtf8(svnStatusMap[pysvn.wc_status_kind.missing]), + ] + self.unversionedIndicators = [ - self.trUtf8(svnStatusMap[pysvn.wc_status_kind.unversioned]) + self.trUtf8(svnStatusMap[pysvn.wc_status_kind.unversioned]), ] self.lockedIndicators = [ - self.trUtf8('locked') + self.trUtf8('locked'), ] self.stealBreakLockIndicators = [ self.trUtf8('other lock'), self.trUtf8('stolen lock'), - self.trUtf8('broken lock') + self.trUtf8('broken lock'), ] self.unlockedIndicators = [ - self.trUtf8('not locked') + self.trUtf8('not locked'), ] self.lockinfo = { @@ -141,7 +153,7 @@ } self.yesno = [ self.trUtf8('no'), - self.trUtf8('yes') + self.trUtf8('yes'), ] self.client = self.vcs.getClient() @@ -188,9 +200,11 @@ @param author author of the last change (string) @param path path of the file or directory (string) """ + statusText = self.trUtf8(svnStatusMap[status]) itm = QTreeWidgetItem(self.statusList, [ + "", changelist, - self.trUtf8(svnStatusMap[status]), + statusText, self.trUtf8(svnStatusMap[propStatus]), self.yesno[locked], self.yesno[history], @@ -203,18 +217,29 @@ path, ]) - itm.setTextAlignment(0, Qt.AlignLeft) - itm.setTextAlignment(1, Qt.AlignHCenter) + itm.setTextAlignment(1, Qt.AlignLeft) itm.setTextAlignment(2, Qt.AlignHCenter) itm.setTextAlignment(3, Qt.AlignHCenter) itm.setTextAlignment(4, Qt.AlignHCenter) itm.setTextAlignment(5, Qt.AlignHCenter) itm.setTextAlignment(6, Qt.AlignHCenter) itm.setTextAlignment(7, Qt.AlignHCenter) - itm.setTextAlignment(8, Qt.AlignRight) + itm.setTextAlignment(8, Qt.AlignHCenter) itm.setTextAlignment(9, Qt.AlignRight) - itm.setTextAlignment(10, Qt.AlignLeft) + itm.setTextAlignment(10, Qt.AlignRight) itm.setTextAlignment(11, Qt.AlignLeft) + itm.setTextAlignment(12, Qt.AlignLeft) + + if status in [pysvn.wc_status_kind.added, + pysvn.wc_status_kind.deleted, + pysvn.wc_status_kind.modified] or \ + propStatus in [pysvn.wc_status_kind.added, + pysvn.wc_status_kind.deleted, + pysvn.wc_status_kind.modified]: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + + if statusText not in self.__statusFilters: + self.__statusFilters.append(statusText) def start(self, fn): """ @@ -225,6 +250,18 @@ """ self.errorGroup.hide() + for act in self.menuactions: + act.setEnabled(False) + + self.addButton.setEnabled(False) + self.commitButton.setEnabled(False) + self.diffButton.setEnabled(False) + self.revertButton.setEnabled(False) + self.restoreButton.setEnabled(False) + + self.statusFilterCombo.clear() + self.__statusFilters = [] + QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) QApplication.processEvents() @@ -245,6 +282,7 @@ recurse = "--non-recursive" not in opts update = "--show-updates" in opts + hideChangelistColumn = True hidePropertyStatusColumn = True hideLockColumns = True hideUpToDateColumn = True @@ -266,8 +304,8 @@ changelists = self.client.get_changelist(name, depth=depth) for entry in changelists: changelistsDict[entry[0]] = entry[1] - self.statusList.setColumnHidden(self.__changelistColumn, - len(changelistsDict) == 0) + hideChangelistColumn = hideChangelistColumn and \ + len(changelistsDict) == 0 # step 2: determine status of files allFiles = self.client.status(name, recurse = recurse, @@ -353,6 +391,8 @@ hideHistoryColumn) self.statusList.setColumnHidden(self.__switchedColumn, hideSwitchedColumn) + self.statusList.setColumnHidden(self.__changelistColumn, + hideChangelistColumn) locker.unlock() self.__finish() @@ -370,6 +410,12 @@ self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) self.refreshButton.setEnabled(True) + self.__updateButtons() + self.__updateCommitButton() + + self.__statusFilters.sort() + self.__statusFilters.insert(0, "<{0}>".format(self.trUtf8("all"))) + self.statusFilterCombo.addItems(self.__statusFilters) for act in self.menuactions: act.setEnabled(True) @@ -404,9 +450,6 @@ self.refreshButton.setEnabled(False) - for act in self.menuactions: - act.setEnabled(False) - self.statusList.clear() self.shouldCancel = False @@ -422,6 +465,95 @@ self.errors.insertPlainText(msg) self.errors.ensureCursorVisible() + def __updateButtons(self): + """ + Private method to update the VCS buttons status. + """ + modified = len(self.__getModifiedItems()) + unversioned = len(self.__getUnversionedItems()) + missing = len(self.__getMissingItems()) + + self.addButton.setEnabled(unversioned) + self.diffButton.setEnabled(modified) + self.revertButton.setEnabled(modified) + self.restoreButton.setEnabled(missing) + + def __updateCommitButton(self): + """ + Private method to update the Commit button status. + """ + commitable = len(self.__getCommitableItems()) + self.commitButton.setEnabled(commitable) + + @pyqtSlot(str) + def on_statusFilterCombo_activated(self, txt): + """ + Private slot to react to the selection of a status filter. + + @param txt selected status filter (string) + """ + if txt == "<{0}>".format(self.trUtf8("all")): + for topIndex in range(self.statusList.topLevelItemCount()): + topItem = self.statusList.topLevelItem(topIndex) + topItem.setHidden(False) + else: + for topIndex in range(self.statusList.topLevelItemCount()): + topItem = self.statusList.topLevelItem(topIndex) + topItem.setHidden(topItem.text(self.__statusColumn) != txt) + + @pyqtSlot(QTreeWidgetItem, int) + def on_statusList_itemChanged(self, item, column): + """ + Private slot to act upon item changes. + + @param item reference to the changed item (QTreeWidgetItem) + @param column index of column that changed (integer) + """ + if column == self.__toBeCommittedColumn: + self.__updateCommitButton() + + @pyqtSlot() + def on_statusList_itemSelectionChanged(self): + """ + Private slot to act upon changes of selected items. + """ + self.__updateButtons() + + @pyqtSlot() + def on_commitButton_clicked(self): + """ + Private slot to handle the press of the Commit button. + """ + self.__commit() + + @pyqtSlot() + def on_addButton_clicked(self): + """ + Private slot to handle the press of the Add button. + """ + self.__add() + + @pyqtSlot() + def on_diffButton_clicked(self): + """ + Private slot to handle the press of the Differences button. + """ + self.__diff() + + @pyqtSlot() + def on_revertButton_clicked(self): + """ + Private slot to handle the press of the Revert button. + """ + self.__revert() + + @pyqtSlot() + def on_restoreButton_clicked(self): + """ + Private slot to handle the press of the Restore button. + """ + self.__restoreMissing() + ########################################################################### ## Context menu handling methods ########################################################################### @@ -438,13 +570,13 @@ """ Private slot to handle the Commit context menu entry. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ - for itm in self.__getModifiedItems()] + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getCommitableItems()] if not names: E5MessageBox.information(self, self.trUtf8("Commit"), - self.trUtf8("""There are no uncommitted changes""" - """ available/selected.""")) + self.trUtf8("""There are no entries selected to be""" + """ committed.""")) return if Preferences.getVCS("AutoSaveFiles"): @@ -503,6 +635,42 @@ project.getModel().updateVCSStatus(name) self.vcs.checkVCSStatus() + def __restoreMissing(self): + """ + Private slot to handle the Restore Missing context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getMissingItems()] + if not names: + E5MessageBox.information(self, + self.trUtf8("Revert"), + self.trUtf8("""There are no missing entries""" + """ available/selected.""")) + return + + self.vcs.vcsRevert(names) + self.on_refreshButton_clicked() + self.vcs.checkVCSStatus() + + def __diff(self): + """ + Private slot to handle the Diff context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getModifiedItems()] + if not names: + E5MessageBox.information(self, + self.trUtf8("Differences"), + self.trUtf8("""There are no uncommitted changes""" + """ available/selected.""")) + return + + if self.diff is None: + self.diff = SvnDiffDialog(self.vcs) + self.diff.show() + QApplication.processEvents() + self.diff.start(names) + def __lock(self): """ Private slot to handle the Lock context menu entry. @@ -605,6 +773,19 @@ self.vcs.svnRemoveFromChangelist(names) self.on_refreshButton_clicked() + def __getCommitableItems(self): + """ + Private method to retrieve all entries the user wants to commit. + + @return list of all items, the user has checked + """ + commitableItems = [] + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.checkState(self.__toBeCommittedColumn) == Qt.Checked: + commitableItems.append(itm) + return commitableItems + def __getModifiedItems(self): """ Private method to retrieve all entries, that have a modified status. @@ -631,6 +812,18 @@ unversionedItems.append(itm) return unversionedItems + def __getMissingItems(self): + """ + Private method to retrieve all entries, that have a missing status. + + @return list of all items with a missing status + """ + missingItems = [] + for itm in self.statusList.selectedItems(): + if itm.text(self.__statusColumn) in self.missingIndicators: + missingItems.append(itm) + return missingItems + def __getLockActionItems(self, indicators): """ Private method to retrieve all entries, that have a locked status.
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui Sat Feb 26 14:28:21 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui Sat Feb 26 18:14:12 2011 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnStatusDialog</class> - <widget class="QWidget" name="SvnStatusDialog" > - <property name="geometry" > + <widget class="QWidget" name="SvnStatusDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,123 +10,236 @@ <height>646</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion Status</string> </property> - <property name="whatsThis" > - <string><b>Subversion Status</b> -<p>This dialog shows the status of the selected file or project.</p></string> + <property name="whatsThis"> + <string><b>Subversion Status</b> +<p>This dialog shows the status of the selected file or project.</p></string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QTreeWidget" name="statusList" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>&Filter on Status:</string> + </property> + <property name="buddy"> + <cstring>statusFilterCombo</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="statusFilterCombo"> + <property name="toolTip"> + <string>Select the status of entries to be shown</string> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToContents</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QTreeWidget" name="statusList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>4</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="selectionMode" > + <property name="selectionMode"> <enum>QAbstractItemView::ExtendedSelection</enum> </property> - <property name="rootIsDecorated" > + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="itemsExpandable" > + <property name="itemsExpandable"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> <string>Changelist</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Status</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Prop. Status</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Locked</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>History</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Switched</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Lock Info</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Up to date</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Revision</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Last Change</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Author</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Path</string> </property> </column> </widget> </item> <item> - <widget class="QGroupBox" name="errorGroup" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="commitButton"> + <property name="toolTip"> + <string>Commit the selected changes</string> + </property> + <property name="text"> + <string>&Commit</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> + <string>Add the selected entries to the repository</string> + </property> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="diffButton"> + <property name="toolTip"> + <string>Show differences of the selected entries to the repository</string> + </property> + <property name="text"> + <string>&Differences</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="revertButton"> + <property name="toolTip"> + <string>Revert the selected entries to the last revision in the repository</string> + </property> + <property name="text"> + <string>Re&vert</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="restoreButton"> + <property name="toolTip"> + <string>Restore the selected missing entries from the repository</string> + </property> + <property name="text"> + <string>&Restore</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>Errors</string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QTextEdit" name="errors" > - <property name="focusPolicy" > + <widget class="QTextEdit" name="errors"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> - <property name="acceptRichText" > + <property name="acceptRichText"> <bool>false</bool> </property> </widget> @@ -134,19 +248,29 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="11" /> + <layoutdefault spacing="6" margin="11"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>statusFilterCombo</tabstop> + <tabstop>statusList</tabstop> + <tabstop>commitButton</tabstop> + <tabstop>addButton</tabstop> + <tabstop>diffButton</tabstop> + <tabstop>revertButton</tabstop> + <tabstop>restoreButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> <resources/> <connections/> </ui>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat Feb 26 14:28:21 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat Feb 26 18:14:12 2011 +0100 @@ -16,6 +16,8 @@ from E5Gui.E5Application import e5App from E5Gui import E5MessageBox +from .SvnDiffDialog import SvnDiffDialog + from .Ui_SvnStatusDialog import Ui_SvnStatusDialog import Preferences @@ -35,15 +37,16 @@ QWidget.__init__(self, parent) self.setupUi(self) - self.__changelistColumn = 0 - self.__statusColumn = 1 - self.__propStatusColumn = 2 - self.__lockedColumn = 3 - self.__historyColumn = 4 - self.__switchedColumn = 5 - self.__lockinfoColumn = 6 - self.__upToDateColumn = 7 - self.__pathColumn = 11 + self.__toBeCommittedColumn = 0 + self.__changelistColumn = 1 + self.__statusColumn = 2 + self.__propStatusColumn = 3 + self.__lockedColumn = 4 + self.__historyColumn = 5 + self.__switchedColumn = 6 + self.__lockinfoColumn = 7 + self.__upToDateColumn = 8 + self.__pathColumn = 12 self.__lastColumn = self.statusList.columnCount() self.refreshButton = \ @@ -55,6 +58,7 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + self.diff = None self.process = None self.vcs = vcs self.vcs.committed.connect(self.__committed) @@ -73,7 +77,11 @@ self.menuactions.append(self.menu.addAction( self.trUtf8("Add to repository"), self.__add)) self.menuactions.append(self.menu.addAction( + self.trUtf8("Show differences"), self.__diff)) + self.menuactions.append(self.menu.addAction( self.trUtf8("Revert changes"), self.__revert)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Restore missing"), self.__restoreMissing)) if self.vcs.versionStr >= '1.5.0': self.menu.addSeparator() self.menuactions.append(self.menu.addAction( @@ -110,6 +118,10 @@ self.trUtf8('modified'), ] + self.missingIndicators = [ + self.trUtf8('missing'), + ] + self.unversionedIndicators = [ self.trUtf8('unversioned'), ] @@ -225,9 +237,10 @@ self.currentChangelist == "": return + statusText = self.status[status] itm = QTreeWidgetItem(self.statusList, [ self.currentChangelist, - self.status[status], + statusText, self.propStatus[propStatus], self.locked[locked], self.history[history], @@ -240,18 +253,21 @@ path, ]) - itm.setTextAlignment(0, Qt.AlignLeft) - itm.setTextAlignment(1, Qt.AlignHCenter) + itm.setTextAlignment(1, Qt.AlignLeft) itm.setTextAlignment(2, Qt.AlignHCenter) itm.setTextAlignment(3, Qt.AlignHCenter) itm.setTextAlignment(4, Qt.AlignHCenter) itm.setTextAlignment(5, Qt.AlignHCenter) itm.setTextAlignment(6, Qt.AlignHCenter) itm.setTextAlignment(7, Qt.AlignHCenter) - itm.setTextAlignment(8, Qt.AlignRight) + itm.setTextAlignment(8, Qt.AlignHCenter) itm.setTextAlignment(9, Qt.AlignRight) - itm.setTextAlignment(10, Qt.AlignLeft) + itm.setTextAlignment(10, Qt.AlignRight) itm.setTextAlignment(11, Qt.AlignLeft) + itm.setTextAlignment(12, Qt.AlignLeft) + + if status in "ADM" or propStatus in "M": + itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) self.hidePropertyStatusColumn = self.hidePropertyStatusColumn and \ propStatus == " " @@ -261,6 +277,9 @@ self.hideHistoryColumn = self.hideHistoryColumn and history == " " self.hideSwitchedColumn = self.hideSwitchedColumn and switched == " " + if statusText not in self.__statusFilters: + self.__statusFilters.append(statusText) + def closeEvent(self, e): """ Private slot implementing a close event handler. @@ -285,6 +304,19 @@ self.errorGroup.hide() self.intercept = False self.args = fn + + for act in self.menuactions: + act.setEnabled(False) + + self.addButton.setEnabled(False) + self.commitButton.setEnabled(False) + self.diffButton.setEnabled(False) + self.revertButton.setEnabled(False) + self.restoreButton.setEnabled(False) + + self.statusFilterCombo.clear() + self.__statusFilters = [] + self.currentChangelist = "" self.changelistFound = False @@ -358,6 +390,10 @@ self.inputGroup.setEnabled(False) self.refreshButton.setEnabled(True) + self.__statusFilters.sort() + self.__statusFilters.insert(0, "<{0}>".format(self.trUtf8("all"))) + self.statusFilterCombo.addItems(self.__statusFilters) + for act in self.menuactions: act.setEnabled(True) @@ -382,6 +418,9 @@ self.statusList.setColumnHidden(self.__switchedColumn, self.hideSwitchedColumn) + self.__updateButtons() + self.__updateCommitButton() + def on_buttonBox_clicked(self, button): """ Private slot called by a button of the button box clicked. @@ -516,12 +555,98 @@ self.inputGroup.setEnabled(True) self.refreshButton.setEnabled(False) - for act in self.menuactions: - act.setEnabled(False) - self.statusList.clear() self.start(self.args) + + def __updateButtons(self): + """ + Private method to update the VCS buttons status. + """ + modified = len(self.__getModifiedItems()) + unversioned = len(self.__getUnversionedItems()) + missing = len(self.__getMissingItems()) + + self.addButton.setEnabled(unversioned) + self.diffButton.setEnabled(modified) + self.revertButton.setEnabled(modified) + self.restoreButton.setEnabled(missing) + + def __updateCommitButton(self): + """ + Private method to update the Commit button status. + """ + commitable = len(self.__getCommitableItems()) + self.commitButton.setEnabled(commitable) + + @pyqtSlot(str) + def on_statusFilterCombo_activated(self, txt): + """ + Private slot to react to the selection of a status filter. + + @param txt selected status filter (string) + """ + if txt == "<{0}>".format(self.trUtf8("all")): + for topIndex in range(self.statusList.topLevelItemCount()): + topItem = self.statusList.topLevelItem(topIndex) + topItem.setHidden(False) + else: + for topIndex in range(self.statusList.topLevelItemCount()): + topItem = self.statusList.topLevelItem(topIndex) + topItem.setHidden(topItem.text(self.__statusColumn) != txt) + + @pyqtSlot(QTreeWidgetItem, int) + def on_statusList_itemChanged(self, item, column): + """ + Private slot to act upon item changes. + + @param item reference to the changed item (QTreeWidgetItem) + @param column index of column that changed (integer) + """ + if column == self.__toBeCommittedColumn: + self.__updateCommitButton() + + @pyqtSlot() + def on_statusList_itemSelectionChanged(self): + """ + Private slot to act upon changes of selected items. + """ + self.__updateButtons() + + @pyqtSlot() + def on_commitButton_clicked(self): + """ + Private slot to handle the press of the Commit button. + """ + self.__commit() + + @pyqtSlot() + def on_addButton_clicked(self): + """ + Private slot to handle the press of the Add button. + """ + self.__add() + + @pyqtSlot() + def on_diffButton_clicked(self): + """ + Private slot to handle the press of the Differences button. + """ + self.__diff() + + @pyqtSlot() + def on_revertButton_clicked(self): + """ + Private slot to handle the press of the Revert button. + """ + self.__revert() + + @pyqtSlot() + def on_restoreButton_clicked(self): + """ + Private slot to handle the press of the Restore button. + """ + self.__restoreMissing() ########################################################################### ## Context menu handling methods @@ -540,12 +665,12 @@ Private slot to handle the Commit context menu entry. """ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) - for itm in self.__getModifiedItems()] + for itm in self.__getCommitableItems()] if not names: E5MessageBox.information(self, self.trUtf8("Commit"), - self.trUtf8("""There are no uncommitted changes""" - """ available/selected.""")) + self.trUtf8("""There are no entries selected to be""" + """ committed.""")) return if Preferences.getVCS("AutoSaveFiles"): @@ -604,6 +729,42 @@ project.getModel().updateVCSStatus(name) self.vcs.checkVCSStatus() + def __restoreMissing(self): + """ + Private slot to handle the Restore Missing context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getMissingItems()] + if not names: + E5MessageBox.information(self, + self.trUtf8("Revert"), + self.trUtf8("""There are no missing entries""" + """ available/selected.""")) + return + + self.vcs.vcsRevert(names) + self.on_refreshButton_clicked() + self.vcs.checkVCSStatus() + + def __diff(self): + """ + Private slot to handle the Diff context menu entry. + """ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) + for itm in self.__getModifiedItems()] + if not names: + E5MessageBox.information(self, + self.trUtf8("Differences"), + self.trUtf8("""There are no uncommitted changes""" + """ available/selected.""")) + return + + if self.diff is None: + self.diff = SvnDiffDialog(self.vcs) + self.diff.show() + QApplication.processEvents() + self.diff.start(names) + def __lock(self): """ Private slot to handle the Lock context menu entry. @@ -706,6 +867,19 @@ self.vcs.svnRemoveFromChangelist(names) self.on_refreshButton_clicked() + def __getCommitableItems(self): + """ + Private method to retrieve all entries the user wants to commit. + + @return list of all items, the user has checked + """ + commitableItems = [] + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.checkState(self.__toBeCommittedColumn) == Qt.Checked: + commitableItems.append(itm) + return commitableItems + def __getModifiedItems(self): """ Private method to retrieve all entries, that have a modified status. @@ -732,6 +906,18 @@ unversionedItems.append(itm) return unversionedItems + def __getMissingItems(self): + """ + Private method to retrieve all entries, that have a missing status. + + @return list of all items with a missing status + """ + missingItems = [] + for itm in self.statusList.selectedItems(): + if itm.text(self.__statusColumn) in self.missingIndicators: + missingItems.append(itm) + return missingItems + def __getLockActionItems(self, indicators): """ Private method to retrieve all emtries, that have a locked status.
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui Sat Feb 26 14:28:21 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui Sat Feb 26 18:14:12 2011 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnStatusDialog</class> - <widget class="QWidget" name="SvnStatusDialog" > - <property name="geometry" > + <widget class="QWidget" name="SvnStatusDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,120 +10,233 @@ <height>646</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion Status</string> </property> - <property name="whatsThis" > - <string><b>Subversion Status</b> -<p>This dialog shows the status of the selected file or project.</p></string> + <property name="whatsThis"> + <string><b>Subversion Status</b> +<p>This dialog shows the status of the selected file or project.</p></string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QTreeWidget" name="statusList" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>&Filter on Status:</string> + </property> + <property name="buddy"> + <cstring>statusFilterCombo</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="statusFilterCombo"> + <property name="toolTip"> + <string>Select the status of entries to be shown</string> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToContents</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QTreeWidget" name="statusList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>3</verstretch> </sizepolicy> </property> - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="selectionMode" > + <property name="selectionMode"> <enum>QAbstractItemView::ExtendedSelection</enum> </property> - <property name="rootIsDecorated" > + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> <string>Changelist</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Status</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Prop. Status</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Locked</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>History</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Switched</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Lock Info</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Up to date</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Revision</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Last Change</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Author</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Path</string> </property> </column> </widget> </item> <item> - <widget class="QGroupBox" name="errorGroup" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="commitButton"> + <property name="toolTip"> + <string>Commit the selected changes</string> + </property> + <property name="text"> + <string>&Commit</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> + <string>Add the selected entries to the repository</string> + </property> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="diffButton"> + <property name="toolTip"> + <string>Show differences of the selected entries to the repository</string> + </property> + <property name="text"> + <string>&Differences</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="revertButton"> + <property name="toolTip"> + <string>Revert the selected entries to the last revision in the repository</string> + </property> + <property name="text"> + <string>Re&vert</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="restoreButton"> + <property name="toolTip"> + <string>Restore the selected missing entries from the repository</string> + </property> + <property name="text"> + <string>&Restore</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>Errors</string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QTextEdit" name="errors" > - <property name="focusPolicy" > + <widget class="QTextEdit" name="errors"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> - <property name="acceptRichText" > + <property name="acceptRichText"> <bool>false</bool> </property> </widget> @@ -131,20 +245,20 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup" > - <property name="title" > + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> <string>Input</string> </property> - <layout class="QGridLayout" > - <item row="1" column="1" > + <layout class="QGridLayout"> + <item row="1" column="1"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>327</width> <height>29</height> @@ -152,35 +266,35 @@ </property> </spacer> </item> - <item row="1" column="2" > - <widget class="QPushButton" name="sendButton" > - <property name="toolTip" > + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> <string>Press to send the input to the subversion process</string> </property> - <property name="text" > + <property name="text"> <string>&Send</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+S</string> </property> </widget> </item> - <item row="0" column="0" colspan="3" > - <widget class="QLineEdit" name="input" > - <property name="toolTip" > + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> <string>Enter data to be sent to the subversion process</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QCheckBox" name="passwordCheckBox" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> <string>Select to switch the input field to password mode</string> </property> - <property name="text" > + <property name="text"> <string>&Password Mode</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+P</string> </property> </widget> @@ -189,23 +303,31 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="11" /> + <layoutdefault spacing="6" margin="11"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> + <tabstop>statusFilterCombo</tabstop> + <tabstop>statusList</tabstop> + <tabstop>commitButton</tabstop> + <tabstop>addButton</tabstop> + <tabstop>diffButton</tabstop> + <tabstop>revertButton</tabstop> + <tabstop>restoreButton</tabstop> <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> <tabstop>sendButton</tabstop> - <tabstop>passwordCheckBox</tabstop> + <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>
--- a/changelog Sat Feb 26 14:28:21 2011 +0100 +++ b/changelog Sat Feb 26 18:14:12 2011 +0100 @@ -6,6 +6,8 @@ - added capability to filter out unwanted items in the file browsers (s. config dialog, interface page) - changed syntax check to report error position within the line +- added functionality to the VCS status dialogs to make them more + general commit dialogs Version 5.1-snapshot-20110123: - bug fixes
--- a/i18n/eric5_cs.ts Sat Feb 26 14:28:21 2011 +0100 +++ b/i18n/eric5_cs.ts Sat Feb 26 18:14:12 2011 +0100 @@ -6929,187 +6929,187 @@ <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4352"/> + <location filename="QScintilla/Editor.py" line="4358"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4818"/> + <location filename="QScintilla/Editor.py" line="4837"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4858"/> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> - <source>Error loading macro</source> - <translation>Chyba při načítání makra</translation> - </message> - <message> <location filename="QScintilla/Editor.py" line="4858"/> + <source>Error loading macro</source> + <translation>Chyba při načítání makra</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5044"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Pozor:</b> Ztratíte všechny změny pokud jej znovu otevřete.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5048"/> + <location filename="QScintilla/Editor.py" line="5067"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5262"/> + <location filename="QScintilla/Editor.py" line="5281"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5264"/> + <location filename="QScintilla/Editor.py" line="5283"/> <source>Add file...</source> <translation>Přidat soubor...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5266"/> + <location filename="QScintilla/Editor.py" line="5285"/> <source>Add files...</source> <translation>Přidat soubory...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5268"/> + <location filename="QScintilla/Editor.py" line="5287"/> <source>Add aliased file...</source> <translation>Přidat zástupce souboru...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5270"/> + <location filename="QScintilla/Editor.py" line="5289"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5273"/> + <location filename="QScintilla/Editor.py" line="5292"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5291"/> + <location filename="QScintilla/Editor.py" line="5310"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5307"/> + <location filename="QScintilla/Editor.py" line="5326"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -7129,12 +7129,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -7209,7 +7209,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5656"/> + <location filename="QScintilla/Editor.py" line="5675"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -7219,12 +7219,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5658"/> + <location filename="QScintilla/Editor.py" line="5677"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5660"/> + <location filename="QScintilla/Editor.py" line="5679"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -7269,12 +7269,12 @@ <translation type="obsolete"><p>Soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4832"/> + <location filename="QScintilla/Editor.py" line="4851"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s makrem <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> + <location filename="QScintilla/Editor.py" line="4858"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Soubor s makrem <b>{0}</b> je poškozen.</p></translation> </message> @@ -7284,27 +7284,27 @@ <translation type="obsolete"><p>Soubor s makrem <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>So souboru s makrem <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5039"/> + <location filename="QScintilla/Editor.py" line="5058"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Soubor <b>{0}</b> byl změněn po té co již byl načten do eric5. Znovu načíst?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5127"/> + <location filename="QScintilla/Editor.py" line="5146"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -7329,12 +7329,12 @@ <translation>Vyčistit varování</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>py3flakes Warning</source> <translation>py3flakes varování</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>No py3flakes warning message available.</source> <translation>Varování py3flakes není dostupné.</translation> </message> @@ -7344,17 +7344,17 @@ <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4735"/> + <location filename="QScintilla/Editor.py" line="4753"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4741"/> + <location filename="QScintilla/Editor.py" line="4759"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> @@ -17572,7 +17572,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="211"/> <source>Mercurial Status</source> <translation>Mercurial status</translation> </message> @@ -17583,175 +17583,275 @@ <translation><b>Mercurial Status</b><p>Tento dialog zobrazuje status vybraného souboru nebo projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="85"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="90"/> <source>Path</source> <translation>Cesta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="188"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="210"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="232"/> <source>Press to send the input to the hg process</source> <translation>Stisknutím odeslat vstup do hg procesu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="235"/> <source>&Send</source> <translation>Ode&slat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="238"/> <source>Alt+S</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="245"/> <source>Enter data to be sent to the hg process</source> <translation>Zadejte data, která se odešlou do hg procesu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="252"/> <source>Select to switch the input field to password mode</source> <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="255"/> <source>&Password Mode</source> <translation>Mód ve&psání hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="258"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="42"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="45"/> <source>Refresh</source> <translation>Obnovit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="43"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="46"/> <source>Press to refresh the status display</source> <translation>Stisknout pro obnovení zobrazní statusu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="60"/> - <source>Add to repository</source> - <translation>Přidat do repozitáře</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <source>Add to repository</source> + <translation>Přidat do repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="75"/> <source>Adjust column sizes</source> <translation>Přizpůsobit šířky sloupců</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>added</source> <translation>přidáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>modified</source> <translation>změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>removed</source> <translation>odebráno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>not tracked</source> <translation>nesledováno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>normal</source> <translation>normální</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>ignored</source> <translation>ignorováno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> <source>missing</source> <translation>chybějící</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> <source>Commit</source> <translation>Zapsat měny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> <source>There are no uncommitted changes available/selected.</source> <translation>Nezapsné změny nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>There are no unversioned entries available/selected.</source> <translation>Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>Revert</source> <translation>Vrátit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Remove from repository</source> <translation>Odebrat z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="549"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>There are no missing entries available/selected.</source> <translation>Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="100"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="117"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="120"/> + <source>&Add</source> + <translation type="unfinished">Přid&at</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="127"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="130"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> + <source>Forget about the selected missing entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="150"/> + <source>For&get</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="160"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="413"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Difference</source> + <translation type="obsolete">Odlišnosti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -34681,336 +34781,431 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="270"/> <source>Subversion Status</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="16"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="17"/> <source><b>Subversion Status</b> <p>This dialog shows the status of the selected file or project.</p></source> <translation><b>Subversion Status</b> <p>Tento dialog zobrazuje status vybraného souboru nebo projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="53"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> <source>Status</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="58"/> - <source>Prop. Status</source> - <translation>Status vlastnost</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="63"/> - <source>Locked</source> - <translation>Zamknuto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="68"/> - <source>History</source> - <translation>Historie</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="73"/> - <source>Switched</source> - <translation>Přepnuto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="78"/> - <source>Lock Info</source> - <translation>Info o zámku</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="83"/> - <source>Up to date</source> - <translation>Aktuální</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> - <source>Revision</source> - <translation>Revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> - <source>Last Change</source> - <translation>Poslední změna</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="98"/> - <source>Author</source> - <translation>Autor</translation> + <source>Prop. Status</source> + <translation>Status vlastnost</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="103"/> + <source>Locked</source> + <translation>Zamknuto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="108"/> + <source>History</source> + <translation>Historie</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="113"/> + <source>Switched</source> + <translation>Přepnuto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="118"/> + <source>Lock Info</source> + <translation>Info o zámku</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="123"/> + <source>Up to date</source> + <translation>Aktuální</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="128"/> + <source>Revision</source> + <translation>Revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="133"/> + <source>Last Change</source> + <translation>Poslední změna</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="138"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="143"/> <source>Path</source> <translation>Cesta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="250"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="158"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="272"/> <source>Press to send the input to the subversion process</source> <translation>Stisknout pro odeslání vstupu do procesu subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="161"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> <source>&Send</source> <translation>Ode&slat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="164"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="278"/> <source>Alt+S</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="171"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> <source>Enter data to be sent to the subversion process</source> <translation>Zadejte data, která mají být do procesu subversion odeslána</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="178"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> <source>Select to switch the input field to password mode</source> <translation>Vybrat pro přepnutí vstupního pole do módu zadání hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="181"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> <source>&Password Mode</source> <translation>Mód ve&psání hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="298"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="58"/> <source>Refresh</source> <translation>Obnovit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="60"/> <source>Press to refresh the status display</source> <translation>Stisknout pro obnovení statusu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="78"/> <source>Commit changes to repository...</source> <translation>Komitnout změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>Lock</source> <translation>Zamknout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="697"/> <source>Unlock</source> <translation>Odemknout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="102"/> <source>Break lock</source> <translation>Prolomit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="105"/> <source>Steal lock</source> <translation>Zcizit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="109"/> <source>Adjust column sizes</source> <translation>Přizpůsobit šířky sloupců</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> <source>added</source> <translation>přidáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="134"/> - <source>deleted</source> - <translation>smazáno</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="146"/> + <source>deleted</source> + <translation>smazáno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> <source>modified</source> <translation>změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="149"/> <source>locked</source> <translation>zamčeno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>other lock</source> <translation>jiný zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> <source>stolen lock</source> <translation>scizený zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> <source>broken lock</source> <translation>prolomený zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="148"/> <source>not locked</source> <translation>nezamčeno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>normal</source> <translation>normální</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="148"/> <source>replaced</source> <translation>nahrazeno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> <source>conflict</source> <translation>konflikt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> <source>external</source> <translation>externí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>ignored</source> <translation>ignorováno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>unversioned</source> <translation>mimo verzi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> <source>missing</source> <translation>chybějící</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="142"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>type error</source> <translation>chyba typu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="143"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>no</source> <translation>ne</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="144"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>yes</source> <translation>ano</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> <source>There are no uncommitted changes available/selected.</source> <translation>Nezapsané změny nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>There are no unlocked files available/selected.</source> <translation>Odemčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>There are no locked files available/selected.</source> <translation>Zamčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="714"/> <source>Break Lock</source> <translation>Prolomit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>Steal Lock</source> <translation>Scizit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="77"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="81"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="79"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="85"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>There are no unversioned entries available/selected.</source> <translation>Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> <source>Revert</source> <translation>Vrátit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="48"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> <source>Changelist</source> <translation>Seznam změn</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Add to Changelist</source> + <translation>Přidat do seznamu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>Remove from Changelist</source> + <translation>Odebrat ze seznamu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="747"/> + <source>There are no files available/selected not belonging to a changelist.</source> + <translation>Nejsou dostupné/vybrány soubory, které nepatří do seznamu změn.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>There are no files available/selected belonging to a changelist.</source> + <translation>Nejsou dostupné/vybrány soubory, které patří do seznamu změn.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="153"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="156"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="170"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="173"/> + <source>&Add</source> + <translation type="unfinished">Přid&at</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="180"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="183"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="203"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="83"/> - <source>Add to Changelist</source> - <translation>Přidat do seznamu změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>Remove from Changelist</source> - <translation>Odebrat ze seznamu změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="579"/> - <source>There are no files available/selected not belonging to a changelist.</source> - <translation>Nejsou dostupné/vybrány soubory, které nepatří do seznamu změn.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>There are no files available/selected belonging to a changelist.</source> - <translation>Nejsou dostupné/vybrány soubory, které patří do seznamu změn.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> - <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> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="495"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Difference</source> + <translation type="obsolete">Odlišnosti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished">Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> </context> <context> @@ -35980,7 +36175,7 @@ <translation>Zobrazit průběh syntaktické kontroly</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="44"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="45"/> <source>Show</source> <translation>Zobrazit</translation> </message> @@ -35995,12 +36190,12 @@ <translation>Zpráva</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="46"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="47"/> <source>Press to show all files containing an issue</source> <translation>Stisknout pro zobrazení všech souborů, které obsahují problém</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="269"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="272"/> <source>No issues found.</source> <translation>Žádné problémy nenalezeny.</translation> </message> @@ -36030,7 +36225,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="188"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="191"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> @@ -41188,12 +41383,12 @@ <translation><p>Můžete použít %-kódy a rezervovaná místa ve stringu. Podporované kódy jsou:<table><tr> <td>%C</td> <td>sloupec kurzoru v aktuálním editoru</td></tr><tr> <td>%D</td> <td>adresář v aktuálním editoru</td></tr><tr> <td>%F</td> <td>jméno souboru v aktuálním editoru</td></tr><tr> <td>%H</td> <td>home adresář aktuálního uživatele</td></tr><tr> <td>%L</td> <td>řádek s kurzorem v aktuálním editoru</td></tr><tr> <td>%P</td> <td>cesta aktuálního projektu</td></tr><tr> <td>%S</td> <td>vybraný text v aktuálním editoru</td></tr><tr> <td>%U</td> <td>uživatelské jméno aktuálního uživatele</td></tr><tr> <td>%%</td> <td>znak procenta</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1132"/> + <location filename="Utilities/__init__.py" line="1138"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1177"/> + <location filename="Utilities/__init__.py" line="1184"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sat Feb 26 14:28:21 2011 +0100 +++ b/i18n/eric5_de.ts Sat Feb 26 18:14:12 2011 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="1.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1578,8 +1577,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="139"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> @@ -1629,7 +1628,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="72"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -6568,12 +6567,12 @@ <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5048"/> + <location filename="QScintilla/Editor.py" line="5067"/> <source>File changed</source> <translation>Datei geändert</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5044"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> </message> @@ -6638,57 +6637,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4858"/> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Macro files (*.macro)</source> <translation>Makro Dateien (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4818"/> + <location filename="QScintilla/Editor.py" line="4837"/> <source>Load macro file</source> <translation>Lade Makro Datei</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> - <source>Error loading macro</source> - <translation>Fehler beim Makro Laden</translation> - </message> - <message> <location filename="QScintilla/Editor.py" line="4858"/> + <source>Error loading macro</source> + <translation>Fehler beim Makro Laden</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Save macro file</source> <translation>Makro Datei schreiben</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -6758,22 +6757,22 @@ <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Please select a coverage file</source> <translation>Bitte wählen sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Please select a profile file</source> <translation>Bitte wählen sie eine Datei mit Profildaten</translation> </message> @@ -6823,7 +6822,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -6833,12 +6832,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -6868,17 +6867,17 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4352"/> + <location filename="QScintilla/Editor.py" line="4358"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> @@ -6888,22 +6887,22 @@ <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4832"/> + <location filename="QScintilla/Editor.py" line="4851"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Die Makro Datei <b>{0}</b> kann nicht gelesen werden.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> + <location filename="QScintilla/Editor.py" line="4858"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Die Makro Datei <b>{0}</b> ist zerstört.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Die Makro Datei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -6948,82 +6947,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5127"/> + <location filename="QScintilla/Editor.py" line="5146"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5262"/> + <location filename="QScintilla/Editor.py" line="5281"/> <source>Resources</source> <translation>Resourcen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5264"/> + <location filename="QScintilla/Editor.py" line="5283"/> <source>Add file...</source> <translation>Datei hinzufügen...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5266"/> + <location filename="QScintilla/Editor.py" line="5285"/> <source>Add files...</source> <translation>Dateien hinzufügen...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5268"/> + <location filename="QScintilla/Editor.py" line="5287"/> <source>Add aliased file...</source> <translation>Aliased Datei hinzufügen...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5270"/> + <location filename="QScintilla/Editor.py" line="5289"/> <source>Add localized resource...</source> <translation>Lokalisierte Resource hinzufügen...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5291"/> + <location filename="QScintilla/Editor.py" line="5310"/> <source>Add file resource</source> <translation>Dateiresource hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5307"/> + <location filename="QScintilla/Editor.py" line="5326"/> <source>Add file resources</source> <translation>Dateiresourcen hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Add aliased file resource</source> <translation>Aliased Dateiresourcen hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias für Datei <b>{0}</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5273"/> + <location filename="QScintilla/Editor.py" line="5292"/> <source>Add resource frame</source> <translation>Resource Rahmen hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -7078,12 +7077,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -7163,7 +7162,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5656"/> + <location filename="QScintilla/Editor.py" line="5675"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -7173,12 +7172,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5658"/> + <location filename="QScintilla/Editor.py" line="5677"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5660"/> + <location filename="QScintilla/Editor.py" line="5679"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -7198,7 +7197,7 @@ <translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5039"/> + <location filename="QScintilla/Editor.py" line="5058"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric5 geöffnet war. Neu einlesen?</p></translation> </message> @@ -7223,12 +7222,12 @@ <translation>Warnungen löschen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>py3flakes Warning</source> <translation>py3flakes Warnung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>No py3flakes warning message available.</source> <translation>Keine Py3flakes Warnung verfügbar.</translation> </message> @@ -7238,17 +7237,17 @@ <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Makro Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4735"/> + <location filename="QScintilla/Editor.py" line="4753"/> <source>Warning: {0}</source> <translation>Warnung: {0}</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4741"/> + <location filename="QScintilla/Editor.py" line="4759"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> @@ -11884,7 +11883,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="778"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -17340,7 +17339,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="211"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -17352,175 +17351,270 @@ <p>Dieser Dialog zeigt den Status der ausgewählten Datei oder des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="85"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="90"/> <source>Path</source> <translation>Pfad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="188"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="210"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="232"/> <source>Press to send the input to the hg process</source> <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="235"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="238"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="245"/> <source>Enter data to be sent to the hg process</source> <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="252"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen um den Passwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="255"/> <source>&Password Mode</source> <translation>&Passwort Modus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="258"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="42"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="45"/> <source>Refresh</source> <translation>Erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="43"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="46"/> <source>Press to refresh the status display</source> <translation>Drücken, um die Statusanzeige zu erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="60"/> - <source>Add to repository</source> - <translation>Zum Repository hinzufügen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <source>Add to repository</source> + <translation>Zum Repository hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="75"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>added</source> <translation>hinzugefügt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>modified</source> <translation>modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>removed</source> <translation>gelöscht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>not tracked</source> <translation>nicht versioniert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>ignored</source> <translation>ignoriert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>There are no unversioned entries available/selected.</source> <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Remove from repository</source> <translation>Vom Repository löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="549"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation>Nach Status &filtern:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation>Wähle den Status anzuzeigender Einträge</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="100"/> + <source>Commit the selected changes</source> + <translation>Ausgewählte Änderungen einpflegen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> + <source>&Commit</source> + <translation>&Einpflegen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="117"/> + <source>Add the selected entries to the repository</source> + <translation>Die ausgewählten Einträge zum Repository hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="120"/> + <source>&Add</source> + <translation>&Hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="127"/> + <source>Show differences of the selected entries to the repository</source> + <translation>Zeigt die Unterschiede der ausgewählten Einträge zum Repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="130"/> + <source>&Differences</source> + <translation>&Unterschiede</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation>Die ausgewählten Einträge auf die letzte Revision im Repository zurücksetzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> + <source>Re&vert</source> + <translation>&Rückgängig machen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> + <source>Forget about the selected missing entries</source> + <translation>Die ausgewählten fehlenden Einträge vergessen.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="150"/> + <source>For&get</source> + <translation>&Vergessen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> + <source>Restore the selected missing entries from the repository</source> + <translation>Die ausgewählten fehlenden Einträge aus dem Repository wiederherstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="160"/> + <source>&Restore</source> + <translation>&Wiederherstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> + <source>Restore missing</source> + <translation>Fehlende wiederherstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="413"/> + <source>all</source> + <translation>alle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Differences</source> + <translation>Unterschiede</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> + <source>There are no entries selected to be committed.</source> + <translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -34244,336 +34338,426 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> <source>added</source> <translation>hinzugefügt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="134"/> - <source>deleted</source> - <translation>gelöscht</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="146"/> + <source>deleted</source> + <translation>gelöscht</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> <source>modified</source> <translation>modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> <source>conflict</source> <translation>Konflikt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>unversioned</source> <translation>unversioniert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="142"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>type error</source> <translation>Typfehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="143"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>no</source> <translation>nein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="144"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>yes</source> <translation>ja</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> <source>external</source> <translation>Extern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>ignored</source> <translation>ignoriert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="270"/> <source>Subversion Status</source> <translation>Subversion Status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="78"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>Lock</source> <translation>Sperren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="697"/> <source>Unlock</source> <translation>Entsperren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="102"/> <source>Break lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="105"/> <source>Steal lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="149"/> <source>locked</source> <translation>gesperrt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>other lock</source> <translation>fremdgesperrt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> <source>stolen lock</source> <translation>Sperre gestohlen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> <source>broken lock</source> <translation>Sperre gebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="148"/> <source>not locked</source> <translation>nicht gesperrt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="148"/> <source>replaced</source> <translation>ersetzt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>There are no unlocked files available/selected.</source> <translation>Es sind keine ungesperrten Dateien vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>There are no locked files available/selected.</source> <translation>Es sind keine gesperrten Dateien vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="714"/> <source>Break Lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="16"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="17"/> <source><b>Subversion Status</b> <p>This dialog shows the status of the selected file or project.</p></source> <translation><b>Subversion Status</b> <p>Dieser Dialog zeigt den Status der ausgewählten Datei oder des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="53"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="58"/> - <source>Prop. Status</source> - <translation>Eigensch. Status</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="63"/> - <source>Locked</source> - <translation>Gesperrt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="68"/> - <source>History</source> - <translation>Geschichte</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="73"/> - <source>Switched</source> - <translation>Umgeschaltet</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="78"/> - <source>Lock Info</source> - <translation>Sperreninfo</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="83"/> - <source>Up to date</source> - <translation>Aktuell</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> - <source>Revision</source> - <translation>Revision</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> - <source>Last Change</source> - <translation>Letzte Änderung</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="98"/> - <source>Author</source> - <translation>Autor</translation> + <source>Prop. Status</source> + <translation>Eigensch. Status</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="103"/> + <source>Locked</source> + <translation>Gesperrt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="108"/> + <source>History</source> + <translation>Geschichte</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="113"/> + <source>Switched</source> + <translation>Umgeschaltet</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="118"/> + <source>Lock Info</source> + <translation>Sperreninfo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="123"/> + <source>Up to date</source> + <translation>Aktuell</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="128"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="133"/> + <source>Last Change</source> + <translation>Letzte Änderung</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="138"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="143"/> <source>Path</source> <translation>Pfad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="250"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="158"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="272"/> <source>Press to send the input to the subversion process</source> <translation>Drücken um die Eingabe an den Subversion Prozess zu senden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="161"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="164"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="278"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="171"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> <source>Enter data to be sent to the subversion process</source> <translation>Gib die Daten ein, die an den Subversion Prozess geschickt werden sollen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="178"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen um den Passwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="181"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> <source>&Password Mode</source> <translation>&Passwort Modus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="298"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="60"/> <source>Press to refresh the status display</source> <translation>Drücken, um die Statusanzeige zu erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="109"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="58"/> <source>Refresh</source> <translation>Erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="77"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="81"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="79"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="85"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>There are no unversioned entries available/selected.</source> <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="48"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> <source>Changelist</source> <translation>Änderungsliste</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Add to Changelist</source> + <translation>Zu Änderungsliste hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>Remove from Changelist</source> + <translation>Von Änderungsliste entfernen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="747"/> + <source>There are no files available/selected not belonging to a changelist.</source> + <translation>Es sind keine Dateien vorhanden/ausgewählt, die nicht zu einer Änderungsliste gehören.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>There are no files available/selected belonging to a changelist.</source> + <translation>Es sind keine Dateien vorhanden/ausgewählt, die zu einer Änderungsliste gehören.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation>Nach Status &filtern:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation>Wähle den Status anzuzeigender Einträge</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="153"/> + <source>Commit the selected changes</source> + <translation>Ausgewählte Änderungen einpflegen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="156"/> + <source>&Commit</source> + <translation>&Einpflegen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="170"/> + <source>Add the selected entries to the repository</source> + <translation>Die ausgewählten Einträge zum Repository hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="173"/> + <source>&Add</source> + <translation>&Hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="180"/> + <source>Show differences of the selected entries to the repository</source> + <translation>Zeigt die Unterschiede der ausgewählten Einträge zum Repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="183"/> + <source>&Differences</source> + <translation>&Unterschiede</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation>Die ausgewählten Einträge auf die letzte Revision im Repository zurücksetzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> + <source>Re&vert</source> + <translation>&Rückgängig machen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> + <source>Restore the selected missing entries from the repository</source> + <translation>Die ausgewählten fehlenden Einträge aus dem Repository wiederherstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="203"/> + <source>&Restore</source> + <translation>&Wiederherstellen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="83"/> - <source>Add to Changelist</source> - <translation>Zu Änderungsliste hinzufügen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>Remove from Changelist</source> - <translation>Von Änderungsliste entfernen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="579"/> - <source>There are no files available/selected not belonging to a changelist.</source> - <translation>Es sind keine Dateien vorhanden/ausgewählt, die nicht zu einer Änderungsliste gehören.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>There are no files available/selected belonging to a changelist.</source> - <translation>Es sind keine Dateien vorhanden/ausgewählt, die zu einer Änderungsliste gehören.</translation> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> + <source>Restore missing</source> + <translation>Fehlende wiederherstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="495"/> + <source>all</source> + <translation>alle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Differences</source> + <translation>Unterschiede</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> + <source>There are no entries selected to be committed.</source> + <translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> + <source>There are no missing entries available/selected.</source> + <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> </context> <context> @@ -35548,7 +35732,7 @@ <translation>Zeigt den Fortschritt der Syntaxprüfung an</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="44"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="45"/> <source>Show</source> <translation>Zeige</translation> </message> @@ -35563,12 +35747,12 @@ <translation>Nachricht</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="46"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="47"/> <source>Press to show all files containing an issue</source> <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="269"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="272"/> <source>No issues found.</source> <translation>Keine Probleme gefunden.</translation> </message> @@ -35598,7 +35782,7 @@ <translation>Starten</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="188"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="191"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> @@ -40718,12 +40902,12 @@ <translation><p>Sie können %-Codes als Platzhalter in der Eingabe verwenden. Unterstützte Codes sind:<table><tr><td>%C</td><td>Spalte des Cursor des aktuellen Editors</td></tr><tr><td>%D</td><td>Verzeichnis des aktuellen Editors</td></tr><tr><td>%F</td><td>Dateiname des aktuellen Editors</td></tr><tr><td>%H</td><td>Home-Verzeichnis des aktullen Nutzers</td></tr><tr><td>%L</td><td>Zeile des Cursor des aktuellen Editors</td></tr><tr><td>%P</td><td>Pfad des aktuellen Projektes</td></tr><tr><td>%S</td><td>selektierter Text des aktuellen Editors</td></tr><tr><td>%U</td><td>Nutzername des aktuellen Nutzers</td></tr><tr><td>%%</td><td>das Prozentzeichen</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1132"/> + <location filename="Utilities/__init__.py" line="1138"/> <source>Python2 interpreter not configured.</source> <translation>Kein Python2 Interpreter konfiguriert.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1177"/> + <location filename="Utilities/__init__.py" line="1184"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Python2 Interpreter wurde nicht innerhalb von 30s beendet.</translation> </message>
--- a/i18n/eric5_en.ts Sat Feb 26 14:28:21 2011 +0100 +++ b/i18n/eric5_en.ts Sat Feb 26 18:14:12 2011 +0100 @@ -6480,7 +6480,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5656"/> + <location filename="QScintilla/Editor.py" line="5675"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -6920,267 +6920,267 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4352"/> + <location filename="QScintilla/Editor.py" line="4358"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4818"/> + <location filename="QScintilla/Editor.py" line="4837"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> + <location filename="QScintilla/Editor.py" line="4877"/> + <source>Macro files (*.macro)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="4858"/> - <source>Macro files (*.macro)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="4839"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4832"/> + <location filename="QScintilla/Editor.py" line="4851"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> - <source><p>The macro file <b>{0}</b> is corrupt.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="QScintilla/Editor.py" line="4858"/> + <source><p>The macro file <b>{0}</b> is corrupt.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5039"/> + <location filename="QScintilla/Editor.py" line="5058"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5044"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5048"/> + <location filename="QScintilla/Editor.py" line="5067"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5127"/> + <location filename="QScintilla/Editor.py" line="5146"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5262"/> + <location filename="QScintilla/Editor.py" line="5281"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5264"/> + <location filename="QScintilla/Editor.py" line="5283"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5266"/> + <location filename="QScintilla/Editor.py" line="5285"/> <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5268"/> + <location filename="QScintilla/Editor.py" line="5287"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5270"/> + <location filename="QScintilla/Editor.py" line="5289"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5273"/> + <location filename="QScintilla/Editor.py" line="5292"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5291"/> + <location filename="QScintilla/Editor.py" line="5310"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5307"/> + <location filename="QScintilla/Editor.py" line="5326"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5658"/> + <location filename="QScintilla/Editor.py" line="5677"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5660"/> + <location filename="QScintilla/Editor.py" line="5679"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4735"/> + <location filename="QScintilla/Editor.py" line="4753"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4741"/> + <location filename="QScintilla/Editor.py" line="4759"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -17236,7 +17236,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="211"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -17247,175 +17247,270 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="85"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="90"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="188"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="210"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="232"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="235"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="238"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="245"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="252"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="255"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="258"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="42"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="45"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="43"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="46"/> <source>Press to refresh the status display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="60"/> - <source>Add to repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> - <source>Remove from repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <source>Add to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> + <source>Remove from repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="75"/> <source>Adjust column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>not tracked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> <source>missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>normal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="549"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>Revert</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="100"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="117"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="120"/> + <source>&Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="127"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="130"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> + <source>Forget about the selected missing entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="150"/> + <source>For&get</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="160"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="413"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -33926,334 +34021,424 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="270"/> <source>Subversion Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="16"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="17"/> <source><b>Subversion Status</b> <p>This dialog shows the status of the selected file or project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="48"/> - <source>Changelist</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="53"/> - <source>Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="58"/> - <source>Prop. Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="63"/> - <source>Locked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="68"/> - <source>History</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="73"/> - <source>Switched</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="78"/> - <source>Lock Info</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="83"/> - <source>Up to date</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> - <source>Revision</source> + <source>Changelist</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> - <source>Last Change</source> + <source>Status</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="98"/> - <source>Author</source> + <source>Prop. Status</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="103"/> + <source>Locked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="108"/> + <source>History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="113"/> + <source>Switched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="118"/> + <source>Lock Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="123"/> + <source>Up to date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="128"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="133"/> + <source>Last Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="138"/> + <source>Author</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="143"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="250"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="158"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="272"/> <source>Press to send the input to the subversion process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="161"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="164"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="278"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="171"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> <source>Enter data to be sent to the subversion process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="178"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="181"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="298"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="58"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="60"/> <source>Press to refresh the status display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="78"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="77"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="81"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="79"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="85"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Add to Changelist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>Remove from Changelist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <source>Lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="697"/> + <source>Unlock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="102"/> + <source>Break lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="105"/> + <source>Steal lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="109"/> + <source>Adjust column sizes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="146"/> + <source>deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> + <source>unversioned</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="149"/> + <source>locked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> + <source>other lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> + <source>stolen lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> + <source>broken lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="148"/> + <source>not locked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> + <source>normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="148"/> + <source>replaced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>conflict</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> + <source>external</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> + <source>ignored</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> + <source>type error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> + <source>no</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> + <source>yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> + <source>Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> + <source>Revert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <source>There are no unlocked files available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> + <source>There are no locked files available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="714"/> + <source>Break Lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> + <source>Steal Lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="747"/> + <source>There are no files available/selected not belonging to a changelist.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>There are no files available/selected belonging to a changelist.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="153"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="156"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="170"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="173"/> + <source>&Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="180"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="183"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="203"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="83"/> - <source>Add to Changelist</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>Remove from Changelist</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> - <source>Lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="529"/> - <source>Unlock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="94"/> - <source>Break lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> - <source>Steal lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="101"/> - <source>Adjust column sizes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="133"/> - <source>added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="134"/> - <source>deleted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="146"/> - <source>modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="140"/> - <source>unversioned</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="137"/> - <source>locked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="138"/> - <source>other lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="139"/> - <source>stolen lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="140"/> - <source>broken lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="136"/> - <source>not locked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> - <source>normal</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="136"/> - <source>replaced</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="147"/> - <source>conflict</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="138"/> - <source>external</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="139"/> - <source>ignored</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="141"/> - <source>missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="142"/> - <source>type error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="143"/> - <source>no</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="144"/> - <source>yes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="444"/> - <source>Commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> - <source>There are no uncommitted changes available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> - <source>Add</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> - <source>There are no unversioned entries available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> - <source>Revert</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> - <source>There are no unlocked files available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> - <source>There are no locked files available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="546"/> - <source>Break Lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> - <source>Steal Lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="579"/> - <source>There are no files available/selected not belonging to a changelist.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>There are no files available/selected belonging to a changelist.</source> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="495"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> + <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> </context> @@ -35247,22 +35432,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="44"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="45"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="46"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="47"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="269"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="272"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="188"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="191"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -40338,12 +40523,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1132"/> + <location filename="Utilities/__init__.py" line="1138"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1177"/> + <location filename="Utilities/__init__.py" line="1184"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat Feb 26 14:28:21 2011 +0100 +++ b/i18n/eric5_es.ts Sat Feb 26 18:14:12 2011 +0100 @@ -6844,197 +6844,197 @@ <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4352"/> + <location filename="QScintilla/Editor.py" line="4358"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4818"/> + <location filename="QScintilla/Editor.py" line="4837"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4858"/> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> - <source>Error loading macro</source> - <translation>Error al cargar macro</translation> - </message> - <message> <location filename="QScintilla/Editor.py" line="4858"/> + <source>Error loading macro</source> + <translation>Error al cargar macro</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5044"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5048"/> + <location filename="QScintilla/Editor.py" line="5067"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5262"/> + <location filename="QScintilla/Editor.py" line="5281"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5264"/> + <location filename="QScintilla/Editor.py" line="5283"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5266"/> + <location filename="QScintilla/Editor.py" line="5285"/> <source>Add files...</source> <translation>Añadir archivos...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5268"/> + <location filename="QScintilla/Editor.py" line="5287"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5270"/> + <location filename="QScintilla/Editor.py" line="5289"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5273"/> + <location filename="QScintilla/Editor.py" line="5292"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5291"/> + <location filename="QScintilla/Editor.py" line="5310"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5307"/> + <location filename="QScintilla/Editor.py" line="5326"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -7109,7 +7109,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5656"/> + <location filename="QScintilla/Editor.py" line="5675"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -7119,12 +7119,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5658"/> + <location filename="QScintilla/Editor.py" line="5677"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5660"/> + <location filename="QScintilla/Editor.py" line="5679"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -7164,37 +7164,37 @@ <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4832"/> + <location filename="QScintilla/Editor.py" line="4851"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> + <location filename="QScintilla/Editor.py" line="4858"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5039"/> + <location filename="QScintilla/Editor.py" line="5058"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric5. ¿Desea volver a cargarlo?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5127"/> + <location filename="QScintilla/Editor.py" line="5146"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -7219,12 +7219,12 @@ <translation>Limpiar advertencias</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>py3flakes Warning</source> <translation>Advertencia de py3flakes</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>No py3flakes warning message available.</source> <translation>No hay un mensaje de advertencia de py3flakes disponible.</translation> </message> @@ -7234,17 +7234,17 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4735"/> + <location filename="QScintilla/Editor.py" line="4753"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4741"/> + <location filename="QScintilla/Editor.py" line="4759"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> @@ -17385,7 +17385,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="211"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -17397,175 +17397,275 @@ <p>Este diálogo muestra el estado del proyecto o archivo seleccionado.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="85"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="90"/> <source>Path</source> <translation>Ruta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="188"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="210"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="232"/> <source>Press to send the input to the hg process</source> <translation>Pulsar para enviar el input al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="235"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="238"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="245"/> <source>Enter data to be sent to the hg process</source> <translation>Introduzca los datos a enviar al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="252"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="255"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="258"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="42"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="45"/> <source>Refresh</source> <translation>Recargar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="43"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="46"/> <source>Press to refresh the status display</source> <translation>Presione para actualizar el estado visualizado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="60"/> - <source>Add to repository</source> - <translation>Añadir al repositorio</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <source>Add to repository</source> + <translation>Añadir al repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="75"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>added</source> <translation>añadido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>modified</source> <translation>modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>removed</source> <translation>eliminado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>not tracked</source> <translation>sin seguimiento</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>ignored</source> <translation>ignorado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Remove from repository</source> <translation>Eliminar de repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="549"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="100"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="117"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="120"/> + <source>&Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="127"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="130"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> + <source>Forget about the selected missing entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="150"/> + <source>For&get</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="160"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="413"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Difference</source> + <translation type="obsolete">Diferencia</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -34256,336 +34356,431 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="270"/> <source>Subversion Status</source> <translation>Estado de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="16"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="17"/> <source><b>Subversion Status</b> <p>This dialog shows the status of the selected file or project.</p></source> <translation><b>Estado de Subversion</b> <p>Este diálogo muestra el estado del proyecto o archivo seleccionado.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="53"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="58"/> - <source>Prop. Status</source> - <translation>Estado de Propiedades</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="63"/> - <source>Locked</source> - <translation>Bloqueado</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="68"/> - <source>History</source> - <translation>Historial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="73"/> - <source>Switched</source> - <translation>Se hizo switch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="78"/> - <source>Lock Info</source> - <translation>Info de bloqueos</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="83"/> - <source>Up to date</source> - <translation>Al dia</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> - <source>Revision</source> - <translation>Revisión</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> - <source>Last Change</source> - <translation>Último cambio</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="98"/> - <source>Author</source> - <translation>Autor</translation> + <source>Prop. Status</source> + <translation>Estado de Propiedades</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="103"/> + <source>Locked</source> + <translation>Bloqueado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="108"/> + <source>History</source> + <translation>Historial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="113"/> + <source>Switched</source> + <translation>Se hizo switch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="118"/> + <source>Lock Info</source> + <translation>Info de bloqueos</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="123"/> + <source>Up to date</source> + <translation>Al dia</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="128"/> + <source>Revision</source> + <translation>Revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="133"/> + <source>Last Change</source> + <translation>Último cambio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="138"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="143"/> <source>Path</source> <translation>Ruta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="250"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="158"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="272"/> <source>Press to send the input to the subversion process</source> <translation>Pulsar para enviar el input al proceso de subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="161"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="164"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="278"/> <source>Alt+S</source> <translation>Alt+E</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="171"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> <source>Enter data to be sent to the subversion process</source> <translation>Introducir datos a enviar al proceso de subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="178"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="181"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="298"/> <source>Alt+P</source> <translation>Alt+M</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="58"/> <source>Refresh</source> <translation>Recargar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="60"/> <source>Press to refresh the status display</source> <translation>Presione para actualizar el estado visualizado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="78"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="77"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="81"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="79"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="85"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>Lock</source> <translation>Bloquear</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="697"/> <source>Unlock</source> <translation>Desbloquear</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="102"/> <source>Break lock</source> <translation>Romper bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="105"/> <source>Steal lock</source> <translation>Robar bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="109"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> <source>added</source> <translation>añadido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="134"/> - <source>deleted</source> - <translation>borrado</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="146"/> + <source>deleted</source> + <translation>borrado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> <source>modified</source> <translation>modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>unversioned</source> <translation>sin versionar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="149"/> <source>locked</source> <translation>bloqueado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>other lock</source> <translation>otro bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> <source>stolen lock</source> <translation>bloqueo robado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> <source>broken lock</source> <translation>bloqueo roto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="148"/> <source>not locked</source> <translation>no bloqueado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="148"/> <source>replaced</source> <translation>reemplazado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> <source>conflict</source> <translation>conflicto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> <source>external</source> <translation>externo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>ignored</source> <translation>ignorado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="142"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>type error</source> <translation>error de tipo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="143"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>no</source> <translation>no</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="144"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>yes</source> <translation>si</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>There are no unlocked files available/selected.</source> <translation>No hay archivos desbloqueados disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>There are no locked files available/selected.</source> <translation>No hay archivos bloqueados disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="714"/> <source>Break Lock</source> <translation>Romper Bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>Steal Lock</source> <translation>Robar Bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="48"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> <source>Changelist</source> <translation>Lista de cambios</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Add to Changelist</source> + <translation>Añadir a la lista de cambios</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>Remove from Changelist</source> + <translation>Quitar de la lista de cambios</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="747"/> + <source>There are no files available/selected not belonging to a changelist.</source> + <translation>No hay archivos disponibles/seleccionados que no pertenezcan a una lista de cambios.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>There are no files available/selected belonging to a changelist.</source> + <translation>No hay archivos disponibles/seleccionados que pertenezcan a una lista de cambios.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="153"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="156"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="170"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="173"/> + <source>&Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="180"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="183"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="203"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="83"/> - <source>Add to Changelist</source> - <translation>Añadir a la lista de cambios</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>Remove from Changelist</source> - <translation>Quitar de la lista de cambios</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="579"/> - <source>There are no files available/selected not belonging to a changelist.</source> - <translation>No hay archivos disponibles/seleccionados que no pertenezcan a una lista de cambios.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>There are no files available/selected belonging to a changelist.</source> - <translation>No hay archivos disponibles/seleccionados que pertenezcan a una lista de cambios.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="495"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Difference</source> + <translation type="obsolete">Diferencia</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished">No hay entradas perdidas disponibles/seleccionadas.</translation> </message> </context> <context> @@ -35556,7 +35751,7 @@ <translation>Muestra el progreso de la revisión de sintaxis</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="44"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="45"/> <source>Show</source> <translation>Mostrar</translation> </message> @@ -35571,12 +35766,12 @@ <translation>Mensaje</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="46"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="47"/> <source>Press to show all files containing an issue</source> <translation>Pulsar para mostrar todos los archivos con algún problema</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="269"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="272"/> <source>No issues found.</source> <translation>No se han encontrado problemas.</translation> </message> @@ -35606,7 +35801,7 @@ <translation>Iniciar</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="188"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="191"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> @@ -40721,12 +40916,12 @@ <translation><p>Puede utilizar %-códigos como marcadores en la cadena. Los valores sportados son:<table><tr><td>%C</td><td>columna del cursos en el editor actual</td></tr><tr><td>%D</td><td>directorio del editor actual</td></tr><tr><td>%F</td><td>nombre de archivo del editor actual</td></tr><tr><td>%H</td><td>directorio home del usuario actual</td></tr><tr><td>%L</td><td>línea del cursor en el editor actual</td></tr><tr><td>%P</td><td>ruta del proyecto actual</td></tr><tr><td>%S</td><td>texto seleccionado en el editor actual</td></tr><tr><td>%U</td><td>nombre de usuario del usuario actual</td></tr><tr><td>%%</td><td>signo de porcentaje</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1132"/> + <location filename="Utilities/__init__.py" line="1138"/> <source>Python2 interpreter not configured.</source> <translation>Intérprete de Python2 no configurado.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1177"/> + <location filename="Utilities/__init__.py" line="1184"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>El intérprete de Python2 no terminó en un plazo de 30s.</translation> </message>
--- a/i18n/eric5_fr.ts Sat Feb 26 14:28:21 2011 +0100 +++ b/i18n/eric5_fr.ts Sat Feb 26 18:14:12 2011 +0100 @@ -7467,87 +7467,87 @@ <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="4877"/> + <source>Macro files (*.macro)</source> + <translation>Fichier Macro (*.macro)</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="4837"/> + <source>Load macro file</source> + <translation>Charger un fichier macro</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="4858"/> - <source>Macro files (*.macro)</source> - <translation>Fichier Macro (*.macro)</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="4818"/> - <source>Load macro file</source> - <translation>Charger un fichier macro</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="4839"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4858"/> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5044"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Warning:</b> Toutes les modifications seront écrasées en réouvrant le fichier.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5048"/> + <location filename="QScintilla/Editor.py" line="5067"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> @@ -7587,7 +7587,7 @@ <translation type="obsolete">Prière de sélectionner un rapport Cyclops à supprimer</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -7597,12 +7597,12 @@ <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> @@ -7632,17 +7632,17 @@ <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4352"/> + <location filename="QScintilla/Editor.py" line="4358"/> <source>All lines have been covered.</source> <translation>Toutes les lignes ont été executées.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> @@ -7742,42 +7742,42 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5262"/> + <location filename="QScintilla/Editor.py" line="5281"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5264"/> + <location filename="QScintilla/Editor.py" line="5283"/> <source>Add file...</source> <translation>Ajouter un fichier...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5266"/> + <location filename="QScintilla/Editor.py" line="5285"/> <source>Add files...</source> <translation>Ajouter des fichiers...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5268"/> + <location filename="QScintilla/Editor.py" line="5287"/> <source>Add aliased file...</source> <translation>Ajouter un fichier alias...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5270"/> + <location filename="QScintilla/Editor.py" line="5289"/> <source>Add localized resource...</source> <translation>Ajouter une ressource localisée...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5291"/> + <location filename="QScintilla/Editor.py" line="5310"/> <source>Add file resource</source> <translation>Ajoute un fichier ressource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5307"/> + <location filename="QScintilla/Editor.py" line="5326"/> <source>Add file resources</source> <translation>Ajoute des fichiers ressources</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Add aliased file resource</source> <translation>Ajoute un alias de fichier ressource</translation> </message> @@ -7787,32 +7787,32 @@ <translation type="obsolete">Alias pour le fichier <b>%1</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Package Diagram</source> <translation>Diagramme de package</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Include class attributes?</source> <translation>Inclure les attributs de classes ?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5273"/> + <location filename="QScintilla/Editor.py" line="5292"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Macro recording is already active. Start new?</source> <translation>L'enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation> </message> @@ -7867,12 +7867,12 @@ <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -7952,7 +7952,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5656"/> + <location filename="QScintilla/Editor.py" line="5675"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -7962,12 +7962,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5658"/> + <location filename="QScintilla/Editor.py" line="5677"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5660"/> + <location filename="QScintilla/Editor.py" line="5679"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -8007,37 +8007,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4832"/> + <location filename="QScintilla/Editor.py" line="4851"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> + <location filename="QScintilla/Editor.py" line="4858"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5039"/> + <location filename="QScintilla/Editor.py" line="5058"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5127"/> + <location filename="QScintilla/Editor.py" line="5146"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -8062,12 +8062,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message> @@ -8077,17 +8077,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4735"/> + <location filename="QScintilla/Editor.py" line="4753"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4741"/> + <location filename="QScintilla/Editor.py" line="4759"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -18816,7 +18816,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="211"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -18827,175 +18827,275 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="85"/> <source>Status</source> <translation type="unfinished">Etat (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="51"/&g