Mon, 05 Aug 2013 15:58:30 +0200
Added capability to compare files side-by-side to the Subversion interfaces.
--- a/APIs/Python3/eric5.api Mon Aug 05 13:17:51 2013 +0200 +++ b/APIs/Python3/eric5.api Mon Aug 05 15:58:30 2013 +0200 @@ -4471,14 +4471,14 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_toDate_dateChanged?4(date) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode="log", bundle=None, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode="log", bundle=None, isFile=False, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries=0, revisions=None) -eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode="log", bundle=None, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode="log", bundle=None, isFile=False, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkCombo_editTextChanged?4(txt) @@ -4789,7 +4789,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgInfo?4(ppath, mode="heads") eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgListTagBranch?4(path, tags=True) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgLogBrowser?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgLogBrowser?4(path, isFile=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPhase?4(name, data=None) @@ -4925,10 +4925,10 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, isFile=False, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.on_buttonBox_clicked?4(button) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog?1(vcs, isFile=False, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog.getData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog?1(realm, username, may_save, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog.getParameters?4() @@ -4974,6 +4974,7 @@ 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_sbsDiffButton_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() @@ -5016,12 +5017,13 @@ eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListProps?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListTagBranch?4(path, tags=True) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnLock?4(name, stealIt=False, parent=None) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnLogBrowser?4(path) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnLogBrowser?4(path, isFile=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRelocate?4(projectPath) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRemoveFromChangelist?4(names) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRepoBrowser?4(projectPath=None) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnResolve?4(name) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnSbsDiff?4(name, extended=False, revisions=None) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnSetProp?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnShowChangelists?4(path) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None) @@ -5151,14 +5153,14 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, isFile=False, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog?1(vcs, isFile=False, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag1Combo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag2Combo_editTextChanged?4(text) @@ -5210,6 +5212,7 @@ 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_sbsDiffButton_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) @@ -5253,12 +5256,13 @@ eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListProps?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListTagBranch?4(path, tags=True) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnLock?4(name, stealIt=False, parent=None) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnLogBrowser?4(path) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnLogBrowser?4(path, isFile=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRelocate?4(projectPath) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRemoveFromChangelist?4(names) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRepoBrowser?4(projectPath=None) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnResolve?4(name) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnSbsDiff?4(name, extended=False, revisions=None) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnSetProp?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnShowChangelists?4(path) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None)
--- a/Documentation/Help/source.qhp Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Help/source.qhp Mon Aug 05 15:58:30 2013 +0200 @@ -9937,6 +9937,8 @@ <keyword name="Subversion" id="Subversion" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion" /> <keyword name="Subversion (Constructor)" id="Subversion (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__init__" /> <keyword name="Subversion (Constructor)" id="Subversion (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.__init__" /> + <keyword name="Subversion.__svnGetFileForRevision" id="Subversion.__svnGetFileForRevision" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__svnGetFileForRevision" /> + <keyword name="Subversion.__svnGetFileForRevision" id="Subversion.__svnGetFileForRevision" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.__svnGetFileForRevision" /> <keyword name="Subversion.__svnURL" id="Subversion.__svnURL" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__svnURL" /> <keyword name="Subversion.__svnURL" id="Subversion.__svnURL" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.__svnURL" /> <keyword name="Subversion.__vcsAllRegisteredStates_wc" id="Subversion.__vcsAllRegisteredStates_wc" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__vcsAllRegisteredStates_wc" /> @@ -9989,6 +9991,8 @@ <keyword name="Subversion.svnRepoBrowser" id="Subversion.svnRepoBrowser" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnRepoBrowser" /> <keyword name="Subversion.svnResolve" id="Subversion.svnResolve" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnResolve" /> <keyword name="Subversion.svnResolve" id="Subversion.svnResolve" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnResolve" /> + <keyword name="Subversion.svnSbsDiff" id="Subversion.svnSbsDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnSbsDiff" /> + <keyword name="Subversion.svnSbsDiff" id="Subversion.svnSbsDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnSbsDiff" /> <keyword name="Subversion.svnSetProp" id="Subversion.svnSetProp" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnSetProp" /> <keyword name="Subversion.svnSetProp" id="Subversion.svnSetProp" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnSetProp" /> <keyword name="Subversion.svnShowChangelists" id="Subversion.svnShowChangelists" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnShowChangelists" /> @@ -10421,6 +10425,10 @@ <keyword name="SvnProjectBrowserHelper.__SVNRemoveFromChangelist" id="SvnProjectBrowserHelper.__SVNRemoveFromChangelist" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNRemoveFromChangelist" /> <keyword name="SvnProjectBrowserHelper.__SVNResolve" id="SvnProjectBrowserHelper.__SVNResolve" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNResolve" /> <keyword name="SvnProjectBrowserHelper.__SVNResolve" id="SvnProjectBrowserHelper.__SVNResolve" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNResolve" /> + <keyword name="SvnProjectBrowserHelper.__SVNSbsDiff" id="SvnProjectBrowserHelper.__SVNSbsDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNSbsDiff" /> + <keyword name="SvnProjectBrowserHelper.__SVNSbsDiff" id="SvnProjectBrowserHelper.__SVNSbsDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNSbsDiff" /> + <keyword name="SvnProjectBrowserHelper.__SVNSbsExtendedDiff" id="SvnProjectBrowserHelper.__SVNSbsExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNSbsExtendedDiff" /> + <keyword name="SvnProjectBrowserHelper.__SVNSbsExtendedDiff" id="SvnProjectBrowserHelper.__SVNSbsExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNSbsExtendedDiff" /> <keyword name="SvnProjectBrowserHelper.__SVNSetProp" id="SvnProjectBrowserHelper.__SVNSetProp" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNSetProp" /> <keyword name="SvnProjectBrowserHelper.__SVNSetProp" id="SvnProjectBrowserHelper.__SVNSetProp" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNSetProp" /> <keyword name="SvnProjectBrowserHelper.__SVNStealLock" id="SvnProjectBrowserHelper.__SVNStealLock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNStealLock" /> @@ -10639,6 +10647,8 @@ <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.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__revert" /> <keyword name="SvnStatusDialog.__revert" id="SvnStatusDialog.__revert" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__revert" /> + <keyword name="SvnStatusDialog.__sbsDiff" id="SvnStatusDialog.__sbsDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__sbsDiff" /> + <keyword name="SvnStatusDialog.__sbsDiff" id="SvnStatusDialog.__sbsDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__sbsDiff" /> <keyword name="SvnStatusDialog.__showContextMenu" id="SvnStatusDialog.__showContextMenu" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__showContextMenu" /> <keyword name="SvnStatusDialog.__showContextMenu" id="SvnStatusDialog.__showContextMenu" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__showContextMenu" /> <keyword name="SvnStatusDialog.__showError" id="SvnStatusDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__showError" /> @@ -10668,6 +10678,8 @@ <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.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_revertButton_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_sbsDiffButton_clicked" id="SvnStatusDialog.on_sbsDiffButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_sbsDiffButton_clicked" /> + <keyword name="SvnStatusDialog.on_sbsDiffButton_clicked" id="SvnStatusDialog.on_sbsDiffButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_sbsDiffButton_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.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.on_statusFilterCombo_activated" /> <keyword name="SvnStatusDialog.on_statusFilterCombo_activated" id="SvnStatusDialog.on_statusFilterCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.on_statusFilterCombo_activated" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Mon Aug 05 15:58:30 2013 +0200 @@ -214,7 +214,7 @@ </table> <a NAME="HgLogBrowserDialog.__init__" ID="HgLogBrowserDialog.__init__"></a> <h4>HgLogBrowserDialog (Constructor)</h4> -<b>HgLogBrowserDialog</b>(<i>vcs, mode="log", bundle=None, parent=None</i>) +<b>HgLogBrowserDialog</b>(<i>vcs, mode="log", bundle=None, isFile=False, parent=None</i>) <p> Constructor </p><dl> @@ -227,6 +227,9 @@ </dd><dt><i>bundle</i></dt> <dd> name of a bundle file (string) +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Mon Aug 05 15:58:30 2013 +0200 @@ -112,7 +112,7 @@ </table> <a NAME="HgLogDialog.__init__" ID="HgLogDialog.__init__"></a> <h4>HgLogDialog (Constructor)</h4> -<b>HgLogDialog</b>(<i>vcs, mode="log", bundle=None, parent=None</i>) +<b>HgLogDialog</b>(<i>vcs, mode="log", bundle=None, isFile=False, parent=None</i>) <p> Constructor </p><dl> @@ -125,6 +125,9 @@ </dd><dt><i>bundle</i></dt> <dd> name of a bundle file (string) +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon Aug 05 15:58:30 2013 +0200 @@ -794,7 +794,7 @@ </dd> </dl><a NAME="Hg.hgLogBrowser" ID="Hg.hgLogBrowser"></a> <h4>Hg.hgLogBrowser</h4> -<b>hgLogBrowser</b>(<i>path</i>) +<b>hgLogBrowser</b>(<i>path, isFile=False</i>) <p> Public method used to browse the log of a file/directory from the Mercurial repository. @@ -802,6 +802,9 @@ <dt><i>path</i></dt> <dd> file/directory name to show the log of (string) +</dd><dt><i>isFile=</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd> </dl><a NAME="Hg.hgNormalizeURL" ID="Hg.hgNormalizeURL"></a> <h4>Hg.hgNormalizeURL</h4>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html Mon Aug 05 15:58:30 2013 +0200 @@ -102,6 +102,12 @@ <td><a href="#SvnProjectBrowserHelper.__SVNResolve">__SVNResolve</a></td> <td>Private slot called by the context menu to resolve conflicts of a file.</td> </tr><tr> +<td><a href="#SvnProjectBrowserHelper.__SVNSbsDiff">__SVNSbsDiff</a></td> +<td>Private slot called by the context menu to show the difference of a file to the repository side-by-side.</td> +</tr><tr> +<td><a href="#SvnProjectBrowserHelper.__SVNSbsExtendedDiff">__SVNSbsExtendedDiff</a></td> +<td>Private slot called by the context menu to show the difference of a file to the repository side-by-side allowing the selection of revisions to compare.</td> +</tr><tr> <td><a href="#SvnProjectBrowserHelper.__SVNSetProp">__SVNSetProp</a></td> <td>Private slot called by the context menu to set a subversion property of a file.</td> </tr><tr> @@ -250,6 +256,18 @@ <b>__SVNResolve</b>(<i></i>) <p> Private slot called by the context menu to resolve conflicts of a file. +</p><a NAME="SvnProjectBrowserHelper.__SVNSbsDiff" ID="SvnProjectBrowserHelper.__SVNSbsDiff"></a> +<h4>SvnProjectBrowserHelper.__SVNSbsDiff</h4> +<b>__SVNSbsDiff</b>(<i></i>) +<p> + Private slot called by the context menu to show the difference of a file to + the repository side-by-side. +</p><a NAME="SvnProjectBrowserHelper.__SVNSbsExtendedDiff" ID="SvnProjectBrowserHelper.__SVNSbsExtendedDiff"></a> +<h4>SvnProjectBrowserHelper.__SVNSbsExtendedDiff</h4> +<b>__SVNSbsExtendedDiff</b>(<i></i>) +<p> + Private slot called by the context menu to show the difference of a file to + the repository side-by-side allowing the selection of revisions to compare. </p><a NAME="SvnProjectBrowserHelper.__SVNSetProp" ID="SvnProjectBrowserHelper.__SVNSetProp"></a> <h4>SvnProjectBrowserHelper.__SVNSetProp</h4> <b>__SVNSetProp</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Mon Aug 05 15:58:30 2013 +0200 @@ -139,13 +139,16 @@ </table> <a NAME="SvnLogBrowserDialog.__init__" ID="SvnLogBrowserDialog.__init__"></a> <h4>SvnLogBrowserDialog (Constructor)</h4> -<b>SvnLogBrowserDialog</b>(<i>vcs, parent=None</i>) +<b>SvnLogBrowserDialog</b>(<i>vcs, isFile=False, parent=None</i>) <p> Constructor </p><dl> <dt><i>vcs</i></dt> <dd> reference to the vcs object +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html Mon Aug 05 15:58:30 2013 +0200 @@ -85,13 +85,16 @@ </table> <a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> <h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, parent=None</i>) +<b>SvnLogDialog</b>(<i>vcs, isFile=False, parent=None</i>) <p> Constructor </p><dl> <dt><i>vcs</i></dt> <dd> reference to the vcs object +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html Mon Aug 05 15:58:30 2013 +0200 @@ -134,6 +134,9 @@ <td><a href="#SvnStatusDialog.__revert">__revert</a></td> <td>Private slot to handle the Revert context menu entry.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__sbsDiff">__sbsDiff</a></td> +<td>Private slot to handle the Side-by-Side Diff context menu entry.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__showContextMenu">__showContextMenu</a></td> <td>Protected slot to show the context menu of the status list.</td> </tr><tr> @@ -173,6 +176,9 @@ <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_sbsDiffButton_clicked">on_sbsDiffButton_clicked</a></td> +<td>Private slot to handle the press of the Side-by-Side Diff 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> @@ -405,6 +411,11 @@ <b>__revert</b>(<i></i>) <p> Private slot to handle the Revert context menu entry. +</p><a NAME="SvnStatusDialog.__sbsDiff" ID="SvnStatusDialog.__sbsDiff"></a> +<h4>SvnStatusDialog.__sbsDiff</h4> +<b>__sbsDiff</b>(<i></i>) +<p> + Private slot to handle the Side-by-Side Diff context menu entry. </p><a NAME="SvnStatusDialog.__showContextMenu" ID="SvnStatusDialog.__showContextMenu"></a> <h4>SvnStatusDialog.__showContextMenu</h4> <b>__showContextMenu</b>(<i>coord</i>) @@ -485,6 +496,11 @@ <b>on_revertButton_clicked</b>(<i></i>) <p> Private slot to handle the press of the Revert button. +</p><a NAME="SvnStatusDialog.on_sbsDiffButton_clicked" ID="SvnStatusDialog.on_sbsDiffButton_clicked"></a> +<h4>SvnStatusDialog.on_sbsDiffButton_clicked</h4> +<b>on_sbsDiffButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Side-by-Side Diff 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>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Mon Aug 05 15:58:30 2013 +0200 @@ -66,6 +66,9 @@ <td><a href="#Subversion.__init__">Subversion</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#Subversion.__svnGetFileForRevision">__svnGetFileForRevision</a></td> +<td>Private method to get a file for a specific revision from the repository.</td> +</tr><tr> <td><a href="#Subversion.__svnURL">__svnURL</a></td> <td>Private method to format a url for subversion.</td> </tr><tr> @@ -147,6 +150,9 @@ <td><a href="#Subversion.svnResolve">svnResolve</a></td> <td>Public method used to resolve conflicts of a file/directory.</td> </tr><tr> +<td><a href="#Subversion.svnSbsDiff">svnSbsDiff</a></td> +<td>Public method used to view the difference of a file to the Mercurial repository side-by-side.</td> +</tr><tr> <td><a href="#Subversion.svnSetProp">svnSetProp</a></td> <td>Public method used to add a property to a file/directory.</td> </tr><tr> @@ -276,6 +282,24 @@ <dd> name of this object (string) </dd> +</dl><a NAME="Subversion.__svnGetFileForRevision" ID="Subversion.__svnGetFileForRevision"></a> +<h4>Subversion.__svnGetFileForRevision</h4> +<b>__svnGetFileForRevision</b>(<i>name, rev=""</i>) +<p> + Private method to get a file for a specific revision from the repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file name to get from the repository (string) +</dd><dt><i>rev=</i></dt> +<dd> +revision to retrieve (integer or string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +contents of the file (string) and an error message (string) +</dd> </dl><a NAME="Subversion.__svnURL" ID="Subversion.__svnURL"></a> <h4>Subversion.__svnURL</h4> <b>__svnURL</b>(<i>url</i>) @@ -587,7 +611,7 @@ </dd> </dl><a NAME="Subversion.svnLogBrowser" ID="Subversion.svnLogBrowser"></a> <h4>Subversion.svnLogBrowser</h4> -<b>svnLogBrowser</b>(<i>path</i>) +<b>svnLogBrowser</b>(<i>path, isFile=False</i>) <p> Public method used to browse the log of a file/directory from the Subversion repository. @@ -595,6 +619,9 @@ <dt><i>path</i></dt> <dd> file/directory name to show the log of (string) +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd> </dl><a NAME="Subversion.svnNormalizeURL" ID="Subversion.svnNormalizeURL"></a> <h4>Subversion.svnNormalizeURL</h4> @@ -654,6 +681,23 @@ <dd> file/directory name to be resolved (string) </dd> +</dl><a NAME="Subversion.svnSbsDiff" ID="Subversion.svnSbsDiff"></a> +<h4>Subversion.svnSbsDiff</h4> +<b>svnSbsDiff</b>(<i>name, extended=False, revisions=None</i>) +<p> + Public method used to view the difference of a file to the Mercurial repository + side-by-side. +</p><dl> +<dt><i>name</i></dt> +<dd> +file name to be diffed (string) +</dd><dt><i>extended=</i></dt> +<dd> +flag indicating the extended variant (boolean) +</dd><dt><i>revisions=</i></dt> +<dd> +tuple of two revisions (tuple of strings) +</dd> </dl><a NAME="Subversion.svnSetProp" ID="Subversion.svnSetProp"></a> <h4>Subversion.svnSetProp</h4> <b>svnSetProp</b>(<i>name, recursive=False</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html Mon Aug 05 15:58:30 2013 +0200 @@ -99,6 +99,12 @@ <td><a href="#SvnProjectBrowserHelper.__SVNResolve">__SVNResolve</a></td> <td>Private slot called by the context menu to resolve conflicts of a file.</td> </tr><tr> +<td><a href="#SvnProjectBrowserHelper.__SVNSbsDiff">__SVNSbsDiff</a></td> +<td>Private slot called by the context menu to show the difference of a file to the repository side-by-side.</td> +</tr><tr> +<td><a href="#SvnProjectBrowserHelper.__SVNSbsExtendedDiff">__SVNSbsExtendedDiff</a></td> +<td>Private slot called by the context menu to show the difference of a file to the repository side-by-side allowing the selection of revisions to compare.</td> +</tr><tr> <td><a href="#SvnProjectBrowserHelper.__SVNSetProp">__SVNSetProp</a></td> <td>Private slot called by the context menu to set a subversion property of a file.</td> </tr><tr> @@ -241,6 +247,18 @@ <b>__SVNResolve</b>(<i></i>) <p> Private slot called by the context menu to resolve conflicts of a file. +</p><a NAME="SvnProjectBrowserHelper.__SVNSbsDiff" ID="SvnProjectBrowserHelper.__SVNSbsDiff"></a> +<h4>SvnProjectBrowserHelper.__SVNSbsDiff</h4> +<b>__SVNSbsDiff</b>(<i></i>) +<p> + Private slot called by the context menu to show the difference of a file to + the repository side-by-side. +</p><a NAME="SvnProjectBrowserHelper.__SVNSbsExtendedDiff" ID="SvnProjectBrowserHelper.__SVNSbsExtendedDiff"></a> +<h4>SvnProjectBrowserHelper.__SVNSbsExtendedDiff</h4> +<b>__SVNSbsExtendedDiff</b>(<i></i>) +<p> + Private slot called by the context menu to show the difference of a file to + the repository side-by-side allowing the selection of revisions to compare. </p><a NAME="SvnProjectBrowserHelper.__SVNSetProp" ID="SvnProjectBrowserHelper.__SVNSetProp"></a> <h4>SvnProjectBrowserHelper.__SVNSetProp</h4> <b>__SVNSetProp</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Mon Aug 05 15:58:30 2013 +0200 @@ -160,13 +160,16 @@ </table> <a NAME="SvnLogBrowserDialog.__init__" ID="SvnLogBrowserDialog.__init__"></a> <h4>SvnLogBrowserDialog (Constructor)</h4> -<b>SvnLogBrowserDialog</b>(<i>vcs, parent=None</i>) +<b>SvnLogBrowserDialog</b>(<i>vcs, isFile=False, parent=None</i>) <p> Constructor </p><dl> <dt><i>vcs</i></dt> <dd> reference to the vcs object +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html Mon Aug 05 15:58:30 2013 +0200 @@ -100,13 +100,16 @@ </table> <a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> <h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, parent=None</i>) +<b>SvnLogDialog</b>(<i>vcs, isFile=False, parent=None</i>) <p> Constructor </p><dl> <dt><i>vcs</i></dt> <dd> reference to the vcs object +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html Mon Aug 05 15:58:30 2013 +0200 @@ -143,6 +143,9 @@ <td><a href="#SvnStatusDialog.__revert">__revert</a></td> <td>Private slot to handle the Revert context menu entry.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__sbsDiff">__sbsDiff</a></td> +<td>Private slot to handle the Side-by-Side Diff context menu entry.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__showContextMenu">__showContextMenu</a></td> <td>Protected slot to show the context menu of the status list.</td> </tr><tr> @@ -191,6 +194,9 @@ <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_sbsDiffButton_clicked">on_sbsDiffButton_clicked</a></td> +<td>Private slot to handle the press of the Side-by-Side Diff 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> @@ -452,6 +458,11 @@ <b>__revert</b>(<i></i>) <p> Private slot to handle the Revert context menu entry. +</p><a NAME="SvnStatusDialog.__sbsDiff" ID="SvnStatusDialog.__sbsDiff"></a> +<h4>SvnStatusDialog.__sbsDiff</h4> +<b>__sbsDiff</b>(<i></i>) +<p> + Private slot to handle the Side-by-Side Diff context menu entry. </p><a NAME="SvnStatusDialog.__showContextMenu" ID="SvnStatusDialog.__showContextMenu"></a> <h4>SvnStatusDialog.__showContextMenu</h4> <b>__showContextMenu</b>(<i>coord</i>) @@ -557,6 +568,11 @@ <b>on_revertButton_clicked</b>(<i></i>) <p> Private slot to handle the press of the Revert button. +</p><a NAME="SvnStatusDialog.on_sbsDiffButton_clicked" ID="SvnStatusDialog.on_sbsDiffButton_clicked"></a> +<h4>SvnStatusDialog.on_sbsDiffButton_clicked</h4> +<b>on_sbsDiffButton_clicked</b>(<i></i>) +<p> + Private slot to handle the press of the Side-by-Side Diff 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>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Mon Aug 05 13:17:51 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Mon Aug 05 15:58:30 2013 +0200 @@ -66,6 +66,9 @@ <td><a href="#Subversion.__init__">Subversion</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#Subversion.__svnGetFileForRevision">__svnGetFileForRevision</a></td> +<td>Private method to get a file for a specific revision from the repository.</td> +</tr><tr> <td><a href="#Subversion.__svnURL">__svnURL</a></td> <td>Private method to format a url for subversion.</td> </tr><tr> @@ -141,6 +144,9 @@ <td><a href="#Subversion.svnResolve">svnResolve</a></td> <td>Public method used to resolve conflicts of a file/directory.</td> </tr><tr> +<td><a href="#Subversion.svnSbsDiff">svnSbsDiff</a></td> +<td>Public method used to view the difference of a file to the Mercurial repository side-by-side.</td> +</tr><tr> <td><a href="#Subversion.svnSetProp">svnSetProp</a></td> <td>Public method used to add a property to a file/directory.</td> </tr><tr> @@ -270,6 +276,24 @@ <dd> name of this object (string) </dd> +</dl><a NAME="Subversion.__svnGetFileForRevision" ID="Subversion.__svnGetFileForRevision"></a> +<h4>Subversion.__svnGetFileForRevision</h4> +<b>__svnGetFileForRevision</b>(<i>name, rev=""</i>) +<p> + Private method to get a file for a specific revision from the repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file name to get from the repository (string) +</dd><dt><i>rev=</i></dt> +<dd> +revision to retrieve (integer or string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +contents of the file (string) and an error message (string) +</dd> </dl><a NAME="Subversion.__svnURL" ID="Subversion.__svnURL"></a> <h4>Subversion.__svnURL</h4> <b>__svnURL</b>(<i>url</i>) @@ -558,7 +582,7 @@ </dd> </dl><a NAME="Subversion.svnLogBrowser" ID="Subversion.svnLogBrowser"></a> <h4>Subversion.svnLogBrowser</h4> -<b>svnLogBrowser</b>(<i>path</i>) +<b>svnLogBrowser</b>(<i>path, isFile=False</i>) <p> Public method used to browse the log of a file/directory from the Subversion repository. @@ -566,6 +590,9 @@ <dt><i>path</i></dt> <dd> file/directory name to show the log of (string) +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) </dd> </dl><a NAME="Subversion.svnNormalizeURL" ID="Subversion.svnNormalizeURL"></a> <h4>Subversion.svnNormalizeURL</h4> @@ -625,6 +652,23 @@ <dd> file/directory name to be resolved (string) </dd> +</dl><a NAME="Subversion.svnSbsDiff" ID="Subversion.svnSbsDiff"></a> +<h4>Subversion.svnSbsDiff</h4> +<b>svnSbsDiff</b>(<i>name, extended=False, revisions=None</i>) +<p> + Public method used to view the difference of a file to the Mercurial repository + side-by-side. +</p><dl> +<dt><i>name</i></dt> +<dd> +file name to be diffed (string) +</dd><dt><i>extended=</i></dt> +<dd> +flag indicating the extended variant (boolean) +</dd><dt><i>revisions=</i></dt> +<dd> +tuple of two revisions (tuple of strings) +</dd> </dl><a NAME="Subversion.svnSetProp" ID="Subversion.svnSetProp"></a> <h4>Subversion.svnSetProp</h4> <b>svnSetProp</b>(<i>name, recursive=False</i>)
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Mon Aug 05 15:58:30 2013 +0200 @@ -257,10 +257,17 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsMenuActions.append(act) + act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), + self.trUtf8('Show difference side-by-side'), self.__SVNSbsDiff) + self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) + act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), + self.trUtf8('Show difference side-by-side (extended)'), + self.__SVNSbsExtendedDiff) + self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) @@ -767,6 +774,24 @@ names.append(itm.dirName()) self.vcs.svnUrlDiff(names) + def __SVNSbsDiff(self): + """ + Private slot called by the context menu to show the difference of a file to + the repository side-by-side. + """ + itm = self.browser.currentItem() + fn = itm.fileName() + self.vcs.svnSbsDiff(fn) + + def __SVNSbsExtendedDiff(self): + """ + Private slot called by the context menu to show the difference of a file to + the repository side-by-side allowing the selection of revisions to compare. + """ + itm = self.browser.currentItem() + fn = itm.fileName() + self.vcs.svnSbsDiff(fn, extended=True) + def __SVNLogBrowser(self): """ Private slot called by the context menu to show the log browser for a file. @@ -774,9 +799,11 @@ itm = self.browser.currentItem() try: fn = itm.fileName() + isFile = True except AttributeError: fn = itm.dirName() - self.vcs.svnLogBrowser(fn) + isFile = False + self.vcs.svnLogBrowser(fn, isFile=isFile) def __SVNBlame(self): """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Mon Aug 05 15:58:30 2013 +0200 @@ -27,11 +27,12 @@ """ Class implementing a dialog to browse the log history. """ - def __init__(self, vcs, parent=None): + def __init__(self, vcs, isFile=False, parent=None): """ Constructor @param vcs reference to the vcs object + @param isFile flag indicating log for a file is to be shown (boolean) @param parent parent widget (QWidget) """ super().__init__(parent) @@ -44,6 +45,8 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) + self.sbsCheckBox.setEnabled(isFile) + self.vcs = vcs self.__maxDate = QDate() @@ -316,13 +319,16 @@ @param rev2 second revision number (integer) @param peg_rev revision number to use as a reference (integer) """ - if self.diff is None: - from .SvnDiffDialog import SvnDiffDialog - self.diff = SvnDiffDialog(self.vcs) - self.diff.show() - self.diff.raise_() - QApplication.processEvents() - self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev) + if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): + self.vcs.svnSbsDiff(self.filename, revisions=(str(rev1), str(rev2))) + else: + if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog + self.diff = SvnDiffDialog(self.vcs) + self.diff.show() + self.diff.raise_() + QApplication.processEvents() + self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev) def on_buttonBox_clicked(self, button): """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Mon Aug 05 15:58:30 2013 +0200 @@ -16,7 +16,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QHBoxLayout"> <item> @@ -191,8 +191,8 @@ </widget> </item> <item> - <layout class="QHBoxLayout"> - <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QPushButton" name="nextButton"> <property name="toolTip"> <string>Press to get the next bunch of log entries</string> @@ -202,7 +202,7 @@ </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QSpinBox" name="limitSpinBox"> <property name="toolTip"> <string>Enter the limit of entries to fetch</string> @@ -217,11 +217,11 @@ <number>10000</number> </property> <property name="value"> - <number>100</number> + <number>20</number> </property> </widget> </item> - <item> + <item row="0" column="2"> <widget class="QCheckBox" name="stopCheckBox"> <property name="toolTip"> <string>Select to stop listing log messages at a copy or move</string> @@ -231,14 +231,14 @@ </property> </widget> </item> - <item> + <item row="0" column="3" rowspan="2"> <widget class="Line" name="line"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> </widget> </item> - <item> + <item row="0" column="4"> <widget class="QPushButton" name="diffPreviousButton"> <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> @@ -248,7 +248,7 @@ </property> </widget> </item> - <item> + <item row="0" column="5"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -258,19 +258,29 @@ </property> </widget> </item> - <item> + <item row="0" column="6"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>91</width> + <width>38</width> <height>29</height> </size> </property> </spacer> </item> + <item row="1" column="4" colspan="3"> + <widget class="QCheckBox" name="sbsCheckBox"> + <property name="toolTip"> + <string>Select to show differences side-by-side</string> + </property> + <property name="text"> + <string>Show differences side-by-side</string> + </property> + </widget> + </item> </layout> </item> <item> @@ -305,6 +315,7 @@ <tabstop>stopCheckBox</tabstop> <tabstop>diffPreviousButton</tabstop> <tabstop>diffRevisionsButton</tabstop> + <tabstop>sbsCheckBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Mon Aug 05 15:58:30 2013 +0200 @@ -29,11 +29,12 @@ The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the versions. """ - def __init__(self, vcs, parent=None): + def __init__(self, vcs, isFile=False, parent=None): """ Constructor @param vcs reference to the vcs object + @param isFile flag indicating log for a file is to be shown (boolean) @param parent parent widget (QWidget) """ super().__init__(parent) @@ -59,6 +60,8 @@ self.revString = self.trUtf8('revision') self.diff = None + self.sbsCheckBox.setEnabled(isFile) + self.client = self.vcs.getClient() self.client.callback_cancel = \ self._clientCancelCallback @@ -226,11 +229,14 @@ return self.contents.scrollToAnchor(ver) - if self.diff is None: - from .SvnDiffDialog import SvnDiffDialog - self.diff = SvnDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2], pegRev=self.__pegRev) + if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): + self.vcs.svnSbsDiff(filename, revisions=(v1, v2)) + else: + if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog + self.diff = SvnDiffDialog(self.vcs) + self.diff.show() + self.diff.start(filename, [v1, v2], pegRev=self.__pegRev) def __showError(self, msg): """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui Mon Aug 05 15:58:30 2013 +0200 @@ -13,7 +13,7 @@ <property name="windowTitle"> <string>Subversion Log</string> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QGroupBox" name="contentsGroup"> <property name="sizePolicy"> @@ -37,6 +37,16 @@ </widget> </item> <item> + <widget class="QCheckBox" name="sbsCheckBox"> + <property name="toolTip"> + <string>Select to show differences side-by-side</string> + </property> + <property name="text"> + <string>Show differences side-by-side</string> + </property> + </widget> + </item> + <item> <widget class="QGroupBox" name="errorGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> @@ -78,6 +88,7 @@ </widget> <tabstops> <tabstop>contents</tabstop> + <tabstop>sbsCheckBox</tabstop> <tabstop>errors</tabstop> <tabstop>buttonBox</tabstop> </tabstops>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui Mon Aug 05 15:58:30 2013 +0200 @@ -1,137 +1,141 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnRevisionSelectionDialog</class> - <widget class="QDialog" name="SvnRevisionSelectionDialog" > - <property name="geometry" > + <widget class="QDialog" name="SvnRevisionSelectionDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>339</width> + <width>399</width> <height>519</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion Diff</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QGroupBox" name="rev1GroupBox" > - <property name="title" > + <widget class="QGroupBox" name="rev1GroupBox"> + <property name="title"> <string>Revision &1</string> </property> - <layout class="QGridLayout" > - <item row="6" column="0" > - <widget class="QRadioButton" name="prev1Button" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="6" column="0"> + <widget class="QRadioButton" name="prev1Button"> + <property name="toolTip"> <string>Select revision before last commit</string> </property> - <property name="text" > + <property name="text"> <string>PREV</string> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QRadioButton" name="committed1Button" > - <property name="toolTip" > + <item row="5" column="0"> + <widget class="QRadioButton" name="committed1Button"> + <property name="toolTip"> <string>Select last committed revision</string> </property> - <property name="text" > + <property name="text"> <string>COMMITTED</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QRadioButton" name="base1Button" > - <property name="toolTip" > + <item row="4" column="0"> + <widget class="QRadioButton" name="base1Button"> + <property name="toolTip"> <string>Select base revision</string> </property> - <property name="text" > + <property name="text"> <string>BASE</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QRadioButton" name="head1Button" > - <property name="toolTip" > + <item row="2" column="0"> + <widget class="QRadioButton" name="head1Button"> + <property name="toolTip"> <string>Select head revision of repository</string> </property> - <property name="text" > + <property name="text"> <string>HEAD</string> </property> - </widget> - </item> - <item row="3" column="0" > - <widget class="QRadioButton" name="working1Button" > - <property name="toolTip" > - <string>Select working revision</string> - </property> - <property name="text" > - <string>WORKING</string> - </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QSpinBox" name="number1SpinBox" > - <property name="enabled" > + <item row="3" column="0"> + <widget class="QRadioButton" name="working1Button"> + <property name="toolTip"> + <string>Select working revision</string> + </property> + <property name="text"> + <string>WORKING</string> + </property> + <property name="checked"> <bool>false</bool> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="number1SpinBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter a revision number</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight</set> </property> - <property name="minimum" > + <property name="minimum"> <number>1</number> </property> - <property name="maximum" > + <property name="maximum"> <number>999999999</number> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QTimeEdit" name="time1Edit" > - <property name="enabled" > + <item row="1" column="2"> + <widget class="QTimeEdit" name="time1Edit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter time of revision</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QDateEdit" name="date1Edit" > - <property name="enabled" > + <item row="1" column="1"> + <widget class="QDateEdit" name="date1Edit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter date of revision</string> </property> - <property name="displayFormat" > + <property name="displayFormat"> <string>yyyy-MM-dd</string> </property> - <property name="calendarPopup" > + <property name="calendarPopup"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="2" > + <item row="0" column="2"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -139,22 +143,22 @@ </property> </spacer> </item> - <item row="0" column="0" > - <widget class="QRadioButton" name="number1Button" > - <property name="toolTip" > + <item row="0" column="0"> + <widget class="QRadioButton" name="number1Button"> + <property name="toolTip"> <string>Select to specify a revision by number</string> </property> - <property name="text" > + <property name="text"> <string>Number</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QRadioButton" name="date1Button" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QRadioButton" name="date1Button"> + <property name="toolTip"> <string>Select to specify a revision by date and time</string> </property> - <property name="text" > + <property name="text"> <string>Date</string> </property> </widget> @@ -163,121 +167,124 @@ </widget> </item> <item> - <widget class="QGroupBox" name="rev2GroupBox" > - <property name="title" > + <widget class="QGroupBox" name="rev2GroupBox"> + <property name="title"> <string>Revision &2</string> </property> - <layout class="QGridLayout" > - <item row="6" column="0" > - <widget class="QRadioButton" name="prev2Button" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="6" column="0"> + <widget class="QRadioButton" name="prev2Button"> + <property name="toolTip"> <string>Select revision before last commit</string> </property> - <property name="text" > + <property name="text"> <string>PREV</string> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QRadioButton" name="committed2Button" > - <property name="toolTip" > + <item row="5" column="0"> + <widget class="QRadioButton" name="committed2Button"> + <property name="toolTip"> <string>Select last committed revision</string> </property> - <property name="text" > + <property name="text"> <string>COMMITTED</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QRadioButton" name="base2Button" > - <property name="toolTip" > + <item row="4" column="0"> + <widget class="QRadioButton" name="base2Button"> + <property name="toolTip"> <string>Select base revision</string> </property> - <property name="text" > + <property name="text"> <string>BASE</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QRadioButton" name="head2Button" > - <property name="toolTip" > + <item row="2" column="0"> + <widget class="QRadioButton" name="head2Button"> + <property name="toolTip"> <string>Select head revision of repository</string> </property> - <property name="text" > + <property name="text"> <string>HEAD</string> </property> - <property name="checked" > + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="working2Button"> + <property name="toolTip"> + <string>Select working revision</string> + </property> + <property name="text"> + <string>WORKING</string> + </property> + <property name="checked"> <bool>true</bool> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QRadioButton" name="working2Button" > - <property name="toolTip" > - <string>Select working revision</string> - </property> - <property name="text" > - <string>WORKING</string> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QSpinBox" name="number2SpinBox" > - <property name="enabled" > + <item row="0" column="1"> + <widget class="QSpinBox" name="number2SpinBox"> + <property name="enabled"> <bool>false</bool> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter a revision number</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight</set> </property> - <property name="minimum" > + <property name="minimum"> <number>1</number> </property> - <property name="maximum" > + <property name="maximum"> <number>999999999</number> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QTimeEdit" name="time2Edit" > - <property name="enabled" > + <item row="1" column="2"> + <widget class="QTimeEdit" name="time2Edit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter time of revision</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QDateEdit" name="date2Edit" > - <property name="enabled" > + <item row="1" column="1"> + <widget class="QDateEdit" name="date2Edit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter date of revision</string> </property> - <property name="displayFormat" > + <property name="displayFormat"> <string>yyyy-MM-dd</string> </property> - <property name="calendarPopup" > + <property name="calendarPopup"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="2" > + <item row="0" column="2"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -285,22 +292,22 @@ </property> </spacer> </item> - <item row="0" column="0" > - <widget class="QRadioButton" name="number2Button" > - <property name="toolTip" > + <item row="0" column="0"> + <widget class="QRadioButton" name="number2Button"> + <property name="toolTip"> <string>Select to specify a revision by number</string> </property> - <property name="text" > + <property name="text"> <string>Number</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QRadioButton" name="date2Button" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QRadioButton" name="date2Button"> + <property name="toolTip"> <string>Select to specify a revision by date and time</string> </property> - <property name="text" > + <property name="text"> <string>Date</string> </property> </widget> @@ -309,18 +316,18 @@ </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::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>number1Button</tabstop> @@ -353,11 +360,11 @@ <receiver>SvnRevisionSelectionDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>27</x> <y>512</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>21</x> <y>143</y> </hint> @@ -369,11 +376,11 @@ <receiver>SvnRevisionSelectionDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>79</x> <y>512</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>73</x> <y>140</y> </hint> @@ -385,11 +392,11 @@ <receiver>number1SpinBox</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>62</x> <y>45</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>148</x> <y>43</y> </hint> @@ -401,11 +408,11 @@ <receiver>date1Edit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>70</x> <y>77</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>136</x> <y>74</y> </hint> @@ -417,11 +424,11 @@ <receiver>time1Edit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>16</x> <y>74</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>257</x> <y>74</y> </hint> @@ -433,11 +440,11 @@ <receiver>number2SpinBox</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>32</x> <y>281</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>128</x> <y>283</y> </hint> @@ -449,11 +456,11 @@ <receiver>date2Edit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>49</x> <y>310</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>134</x> <y>310</y> </hint> @@ -465,11 +472,11 @@ <receiver>time2Edit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>55</x> <y>322</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>264</x> <y>320</y> </hint>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Mon Aug 05 15:58:30 2013 +0200 @@ -89,6 +89,8 @@ self.menuactions.append(self.menu.addAction( self.trUtf8("Show differences"), self.__diff)) self.menuactions.append(self.menu.addAction( + self.trUtf8("Show differences side-by-side"), self.__sbsDiff)) + self.menuactions.append(self.menu.addAction( self.trUtf8("Revert changes"), self.__revert)) self.menuactions.append(self.menu.addAction( self.trUtf8("Restore missing"), self.__restoreMissing)) @@ -264,6 +266,7 @@ self.addButton.setEnabled(False) self.commitButton.setEnabled(False) self.diffButton.setEnabled(False) + self.sbsDiffButton.setEnabled(False) self.revertButton.setEnabled(False) self.restoreButton.setEnabled(False) @@ -484,6 +487,7 @@ self.addButton.setEnabled(unversioned) self.diffButton.setEnabled(modified) + self.sbsDiffButton.setEnabled(modified == 1) self.revertButton.setEnabled(modified) self.restoreButton.setEnabled(missing) @@ -550,6 +554,13 @@ self.__diff() @pyqtSlot() + def on_sbsDiffButton_clicked(self): + """ + Private slot to handle the press of the Side-by-Side Diff button. + """ + self.__sbsDiff() + + @pyqtSlot() def on_revertButton_clicked(self): """ Private slot to handle the press of the Revert button. @@ -694,7 +705,28 @@ self.diff.show() QApplication.processEvents() self.diff.start(names) + + def __sbsDiff(self): + """ + Private slot to handle the Side-by-Side 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("Side-by-Side Diff"), + self.trUtf8("""There are no uncommitted changes""" + """ available/selected.""")) + return + elif len(names) > 1: + E5MessageBox.information(self, + self.trUtf8("Side-by-Side Diff"), + self.trUtf8("""Only one file with uncommitted changes""" + """ must be selected.""")) + return + self.vcs.svnSbsDiff(names[0]) + def __lock(self): """ Private slot to handle the Lock context menu entry.
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui Mon Aug 05 15:58:30 2013 +0200 @@ -185,6 +185,16 @@ </widget> </item> <item> + <widget class="QPushButton" name="sbsDiffButton"> + <property name="toolTip"> + <string>Show differences of the selected entry to the repository in a side-by-side manner</string> + </property> + <property name="text"> + <string>Side-b&y-Side Diff</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> @@ -264,6 +274,7 @@ <tabstop>commitButton</tabstop> <tabstop>addButton</tabstop> <tabstop>diffButton</tabstop> + <tabstop>sbsDiffButton</tabstop> <tabstop>revertButton</tabstop> <tabstop>restoreButton</tabstop> <tabstop>errors</tabstop>
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon Aug 05 15:58:30 2013 +0200 @@ -12,7 +12,7 @@ import urllib.parse import time -from PyQt4.QtCore import QMutexLocker, pyqtSignal, QRegExp +from PyQt4.QtCore import Qt, QMutexLocker, pyqtSignal, QRegExp, QDateTime from PyQt4.QtGui import QLineEdit, QDialog, QInputDialog, QApplication from E5Gui.E5Application import e5App @@ -90,6 +90,7 @@ self.log = None self.diff = None + self.sbsDiff = None self.status = None self.propList = None self.tagbranchList = None @@ -144,6 +145,8 @@ self.log.close() if self.diff is not None: self.diff.close() + if self.sbsDiff is not None: + self.sbsDiff.close() if self.status is not None: self.status.close() if self.propList is not None: @@ -925,6 +928,7 @@ @param name file/directory name to show the log of (string) """ + isFile = os.path.isfile(name) noEntries, ok = QInputDialog.getInt( None, self.trUtf8("Subversion Log"), @@ -932,7 +936,7 @@ self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) if ok: from .SvnLogDialog import SvnLogDialog - self.log = SvnLogDialog(self) + self.log = SvnLogDialog(self, isFile=isFile) self.log.show() QApplication.processEvents() self.log.start(name, noEntries) @@ -1993,15 +1997,118 @@ QApplication.processEvents() self.diff.start(name, urls=urls, summary=summary) - def svnLogBrowser(self, path): + def __svnGetFileForRevision(self, name, rev=""): + """ + Private method to get a file for a specific revision from the repository. + + @param name file name to get from the repository (string) + @keyparam rev revision to retrieve (integer or string) + @return contents of the file (string) and an error message (string) + """ + output = "" + error = "" + + client = self.getClient() + try: + if rev: + if isinstance(rev, int) or rev.isdecimal(): + rev = pysvn.Revision(pysvn.opt_revision_kind.number, int(rev)) + elif rev.startswith("{"): + dateStr = rev[1:-1] + secs = QDateTime.fromString(dateStr, Qt.ISODate).toTime_t() + rev = pysvn.Revision(pysvn.opt_revision_kind.date, secs) + elif rev == "HEAD": + rev = pysvn.Revision(pysvn.opt_revision_kind.head) + elif rev == "COMMITTED": + rev = pysvn.Revision(pysvn.opt_revision_kind.committed) + elif rev == "BASE": + rev = pysvn.Revision(pysvn.opt_revision_kind.base) + elif rev == "WORKING": + rev = pysvn.Revision(pysvn.opt_revision_kind.working) + elif rev == "PREV": + rev = pysvn.Revision(pysvn.opt_revision_kind.previous) + else: + rev = pysvn.Revision(pysvn.opt_revision_kind.unspecified) + output = client.cat(name, revision=rev) + else: + output = client.cat(name) + output = output.decode() + except pysvn.ClientError as e: + error = str(e) + + return output, error + + def svnSbsDiff(self, name, extended=False, revisions=None): + """ + Public method used to view the difference of a file to the Mercurial repository + side-by-side. + + @param name file name to be diffed (string) + @keyparam extended flag indicating the extended variant (boolean) + @keyparam revisions tuple of two revisions (tuple of strings) + """ + if isinstance(name, list): + raise ValueError("Wrong parameter type") + + if extended: + from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog + dlg = SvnRevisionSelectionDialog() + if dlg.exec_() == QDialog.Accepted: + rev1, rev2 = dlg.getRevisions() + if rev1 == "WORKING": + rev1 = "" + if rev2 == "WORKING": + rev2 = "" + elif revisions: + rev1, rev2 = revisions[0], revisions[1] + else: + rev1, rev2 = "", "" + + output1, error = self.__svnGetFileForRevision(name, rev=rev1) + if error: + E5MessageBox.critical(self.__ui, + self.trUtf8("Subversion Side-by-Side Difference"), + error) + return + name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or ".") + + if rev2: + output2, error = self.__svnGetFileForRevision(name, rev=rev2) + if error: + E5MessageBox.critical(self.__ui, + self.trUtf8("Subversion Side-by-Side Difference"), + error) + return + name2 = "{0} (rev. {1})".format(name, rev2) + else: + try: + f1 = open(name, "r", encoding="utf-8") + output2 = f1.read() + f1.close() + name2 = name + except IOError: + E5MessageBox.critical(self.__ui, + self.trUtf8("Subversion Side-by-Side Difference"), + self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""") + .format(name)) + return + + if self.sbsDiff is None: + from UI.CompareDialog import CompareDialog + self.sbsDiff = CompareDialog() + self.sbsDiff.show() + self.sbsDiff.compare(output1, output2, name1, name2) + + def svnLogBrowser(self, path, isFile=False): """ Public method used to browse the log of a file/directory from the Subversion repository. @param path file/directory name to show the log of (string) + @param isFile flag indicating log for a file is to be shown (boolean) """ from .SvnLogBrowserDialog import SvnLogBrowserDialog - self.logBrowser = SvnLogBrowserDialog(self) + self.logBrowser = SvnLogBrowserDialog(self, isFile=isFile) self.logBrowser.show() QApplication.processEvents() self.logBrowser.start(path)
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Mon Aug 05 15:58:30 2013 +0200 @@ -252,10 +252,17 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsMenuActions.append(act) + act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), + self.trUtf8('Show difference side-by-side'), self.__SVNSbsDiff) + self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) + act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), + self.trUtf8('Show difference side-by-side (extended)'), + self.__SVNSbsExtendedDiff) + self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) @@ -761,6 +768,24 @@ names.append(itm.dirName()) self.vcs.svnUrlDiff(names) + def __SVNSbsDiff(self): + """ + Private slot called by the context menu to show the difference of a file to + the repository side-by-side. + """ + itm = self.browser.currentItem() + fn = itm.fileName() + self.vcs.svnSbsDiff(fn) + + def __SVNSbsExtendedDiff(self): + """ + Private slot called by the context menu to show the difference of a file to + the repository side-by-side allowing the selection of revisions to compare. + """ + itm = self.browser.currentItem() + fn = itm.fileName() + self.vcs.svnSbsDiff(fn, extended=True) + def __SVNLogBrowser(self): """ Private slot called by the context menu to show the log browser for a file. @@ -768,9 +793,11 @@ itm = self.browser.currentItem() try: fn = itm.fileName() + isFile = True except AttributeError: fn = itm.dirName() - self.vcs.svnLogBrowser(fn) + isFile = False + self.vcs.svnLogBrowser(fn, isFile=isFile) def __SVNBlame(self): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Mon Aug 05 15:58:30 2013 +0200 @@ -24,11 +24,12 @@ """ Class implementing a dialog to browse the log history. """ - def __init__(self, vcs, parent=None): + def __init__(self, vcs, isFile=False, parent=None): """ Constructor @param vcs reference to the vcs object + @param isFile flag indicating log for a file is to be shown (boolean) @param parent parent widget (QWidget) """ super().__init__(parent) @@ -40,6 +41,8 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) + self.sbsCheckBox.setEnabled(isFile) + self.vcs = vcs self.__maxDate = QDate() @@ -411,12 +414,15 @@ @param rev1 first revision number (integer) @param rev2 second revision number (integer) """ - if self.diff is None: - from .SvnDiffDialog import SvnDiffDialog - self.diff = SvnDiffDialog(self.vcs) - self.diff.show() - self.diff.raise_() - self.diff.start(self.filename, [rev1, rev2]) + if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): + self.vcs.svnSbsDiff(self.filename, revisions=(str(rev1), str(rev2))) + else: + if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog + self.diff = SvnDiffDialog(self.vcs) + self.diff.show() + self.diff.raise_() + self.diff.start(self.filename, [rev1, rev2]) def on_buttonBox_clicked(self, button): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Mon Aug 05 15:58:30 2013 +0200 @@ -16,7 +16,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QHBoxLayout"> <item> @@ -191,8 +191,8 @@ </widget> </item> <item> - <layout class="QHBoxLayout"> - <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QPushButton" name="nextButton"> <property name="toolTip"> <string>Press to get the next bunch of log entries</string> @@ -202,7 +202,7 @@ </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QSpinBox" name="limitSpinBox"> <property name="toolTip"> <string>Enter the limit of entries to fetch</string> @@ -217,11 +217,11 @@ <number>10000</number> </property> <property name="value"> - <number>100</number> + <number>20</number> </property> </widget> </item> - <item> + <item row="0" column="2"> <widget class="QCheckBox" name="stopCheckBox"> <property name="toolTip"> <string>Select to stop listing log messages at a copy or move</string> @@ -231,14 +231,14 @@ </property> </widget> </item> - <item> + <item row="0" column="3" rowspan="2"> <widget class="Line" name="line"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> </widget> </item> - <item> + <item row="0" column="4"> <widget class="QPushButton" name="diffPreviousButton"> <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> @@ -248,7 +248,7 @@ </property> </widget> </item> - <item> + <item row="0" column="5"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -258,19 +258,29 @@ </property> </widget> </item> - <item> + <item row="0" column="6"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>81</width> - <height>29</height> + <width>39</width> + <height>26</height> </size> </property> </spacer> </item> + <item row="1" column="4" colspan="3"> + <widget class="QCheckBox" name="sbsCheckBox"> + <property name="toolTip"> + <string>Select to show differences side-by-side</string> + </property> + <property name="text"> + <string>Show differences side-by-side</string> + </property> + </widget> + </item> </layout> </item> <item> @@ -391,6 +401,7 @@ <tabstop>stopCheckBox</tabstop> <tabstop>diffPreviousButton</tabstop> <tabstop>diffRevisionsButton</tabstop> + <tabstop>sbsCheckBox</tabstop> <tabstop>errors</tabstop> <tabstop>input</tabstop> <tabstop>passwordCheckBox</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Mon Aug 05 15:58:30 2013 +0200 @@ -27,11 +27,12 @@ The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the versions. """ - def __init__(self, vcs, parent=None): + def __init__(self, vcs, isFile=False, parent=None): """ Constructor @param vcs reference to the vcs object + @param isFile flag indicating log for a file is to be shown (boolean) @param parent parent widget (QWidget) """ super().__init__(parent) @@ -77,6 +78,8 @@ self.buf = [] # buffer for stdout self.diff = None + self.sbsCheckBox.setEnabled(isFile) + def closeEvent(self, e): """ Private slot implementing a close event handler. @@ -266,11 +269,14 @@ return self.contents.scrollToAnchor(ver) - if self.diff is None: - from .SvnDiffDialog import SvnDiffDialog - self.diff = SvnDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2]) + if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): + self.vcs.svnSbsDiff(filename, revisions=(v1, v2)) + else: + if self.diff is None: + from .SvnDiffDialog import SvnDiffDialog + self.diff = SvnDiffDialog(self.vcs) + self.diff.show() + self.diff.start(filename, [v1, v2]) def on_passwordCheckBox_toggled(self, isOn): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui Mon Aug 05 15:58:30 2013 +0200 @@ -13,7 +13,7 @@ <property name="windowTitle"> <string>Subversion Log</string> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QGroupBox" name="contentsGroup"> <property name="sizePolicy"> @@ -37,6 +37,16 @@ </widget> </item> <item> + <widget class="QCheckBox" name="sbsCheckBox"> + <property name="toolTip"> + <string>Select to show differences side-by-side</string> + </property> + <property name="text"> + <string>Show differences side-by-side</string> + </property> + </widget> + </item> + <item> <widget class="QGroupBox" name="errorGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> @@ -136,6 +146,7 @@ </widget> <tabstops> <tabstop>contents</tabstop> + <tabstop>sbsCheckBox</tabstop> <tabstop>errors</tabstop> <tabstop>input</tabstop> <tabstop>passwordCheckBox</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.ui Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.ui Mon Aug 05 15:58:30 2013 +0200 @@ -1,137 +1,141 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnRevisionSelectionDialog</class> - <widget class="QDialog" name="SvnRevisionSelectionDialog" > - <property name="geometry" > + <widget class="QDialog" name="SvnRevisionSelectionDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>339</width> + <width>399</width> <height>519</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion Diff</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QGroupBox" name="rev1GroupBox" > - <property name="title" > + <widget class="QGroupBox" name="rev1GroupBox"> + <property name="title"> <string>Revision &1</string> </property> - <layout class="QGridLayout" > - <item row="6" column="0" > - <widget class="QRadioButton" name="prev1Button" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="6" column="0"> + <widget class="QRadioButton" name="prev1Button"> + <property name="toolTip"> <string>Select revision before last commit</string> </property> - <property name="text" > + <property name="text"> <string>PREV</string> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QRadioButton" name="committed1Button" > - <property name="toolTip" > + <item row="5" column="0"> + <widget class="QRadioButton" name="committed1Button"> + <property name="toolTip"> <string>Select last committed revision</string> </property> - <property name="text" > + <property name="text"> <string>COMMITTED</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QRadioButton" name="base1Button" > - <property name="toolTip" > + <item row="4" column="0"> + <widget class="QRadioButton" name="base1Button"> + <property name="toolTip"> <string>Select base revision</string> </property> - <property name="text" > + <property name="text"> <string>BASE</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QRadioButton" name="head1Button" > - <property name="toolTip" > + <item row="2" column="0"> + <widget class="QRadioButton" name="head1Button"> + <property name="toolTip"> <string>Select head revision of repository</string> </property> - <property name="text" > + <property name="text"> <string>HEAD</string> </property> - </widget> - </item> - <item row="3" column="0" > - <widget class="QRadioButton" name="working1Button" > - <property name="toolTip" > - <string>Select working revision</string> - </property> - <property name="text" > - <string>WORKING</string> - </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QSpinBox" name="number1SpinBox" > - <property name="enabled" > + <item row="3" column="0"> + <widget class="QRadioButton" name="working1Button"> + <property name="toolTip"> + <string>Select working revision</string> + </property> + <property name="text"> + <string>WORKING</string> + </property> + <property name="checked"> <bool>false</bool> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="number1SpinBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter a revision number</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight</set> </property> - <property name="minimum" > + <property name="minimum"> <number>1</number> </property> - <property name="maximum" > + <property name="maximum"> <number>999999999</number> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QTimeEdit" name="time1Edit" > - <property name="enabled" > + <item row="1" column="2"> + <widget class="QTimeEdit" name="time1Edit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter time of revision</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QDateEdit" name="date1Edit" > - <property name="enabled" > + <item row="1" column="1"> + <widget class="QDateEdit" name="date1Edit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter date of revision</string> </property> - <property name="displayFormat" > + <property name="displayFormat"> <string>yyyy-MM-dd</string> </property> - <property name="calendarPopup" > + <property name="calendarPopup"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="2" > + <item row="0" column="2"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -139,22 +143,22 @@ </property> </spacer> </item> - <item row="0" column="0" > - <widget class="QRadioButton" name="number1Button" > - <property name="toolTip" > + <item row="0" column="0"> + <widget class="QRadioButton" name="number1Button"> + <property name="toolTip"> <string>Select to specify a revision by number</string> </property> - <property name="text" > + <property name="text"> <string>Number</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QRadioButton" name="date1Button" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QRadioButton" name="date1Button"> + <property name="toolTip"> <string>Select to specify a revision by date and time</string> </property> - <property name="text" > + <property name="text"> <string>Date</string> </property> </widget> @@ -163,121 +167,124 @@ </widget> </item> <item> - <widget class="QGroupBox" name="rev2GroupBox" > - <property name="title" > + <widget class="QGroupBox" name="rev2GroupBox"> + <property name="title"> <string>Revision &2</string> </property> - <layout class="QGridLayout" > - <item row="6" column="0" > - <widget class="QRadioButton" name="prev2Button" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="6" column="0"> + <widget class="QRadioButton" name="prev2Button"> + <property name="toolTip"> <string>Select revision before last commit</string> </property> - <property name="text" > + <property name="text"> <string>PREV</string> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QRadioButton" name="committed2Button" > - <property name="toolTip" > + <item row="5" column="0"> + <widget class="QRadioButton" name="committed2Button"> + <property name="toolTip"> <string>Select last committed revision</string> </property> - <property name="text" > + <property name="text"> <string>COMMITTED</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QRadioButton" name="base2Button" > - <property name="toolTip" > + <item row="4" column="0"> + <widget class="QRadioButton" name="base2Button"> + <property name="toolTip"> <string>Select base revision</string> </property> - <property name="text" > + <property name="text"> <string>BASE</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QRadioButton" name="head2Button" > - <property name="toolTip" > + <item row="2" column="0"> + <widget class="QRadioButton" name="head2Button"> + <property name="toolTip"> <string>Select head revision of repository</string> </property> - <property name="text" > + <property name="text"> <string>HEAD</string> </property> - <property name="checked" > + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="working2Button"> + <property name="toolTip"> + <string>Select working revision</string> + </property> + <property name="text"> + <string>WORKING</string> + </property> + <property name="checked"> <bool>true</bool> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QRadioButton" name="working2Button" > - <property name="toolTip" > - <string>Select working revision</string> - </property> - <property name="text" > - <string>WORKING</string> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QSpinBox" name="number2SpinBox" > - <property name="enabled" > + <item row="0" column="1"> + <widget class="QSpinBox" name="number2SpinBox"> + <property name="enabled"> <bool>false</bool> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter a revision number</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight</set> </property> - <property name="minimum" > + <property name="minimum"> <number>1</number> </property> - <property name="maximum" > + <property name="maximum"> <number>999999999</number> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QTimeEdit" name="time2Edit" > - <property name="enabled" > + <item row="1" column="2"> + <widget class="QTimeEdit" name="time2Edit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter time of revision</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QDateEdit" name="date2Edit" > - <property name="enabled" > + <item row="1" column="1"> + <widget class="QDateEdit" name="date2Edit"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter date of revision</string> </property> - <property name="displayFormat" > + <property name="displayFormat"> <string>yyyy-MM-dd</string> </property> - <property name="calendarPopup" > + <property name="calendarPopup"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="2" > + <item row="0" column="2"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -285,22 +292,22 @@ </property> </spacer> </item> - <item row="0" column="0" > - <widget class="QRadioButton" name="number2Button" > - <property name="toolTip" > + <item row="0" column="0"> + <widget class="QRadioButton" name="number2Button"> + <property name="toolTip"> <string>Select to specify a revision by number</string> </property> - <property name="text" > + <property name="text"> <string>Number</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QRadioButton" name="date2Button" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QRadioButton" name="date2Button"> + <property name="toolTip"> <string>Select to specify a revision by date and time</string> </property> - <property name="text" > + <property name="text"> <string>Date</string> </property> </widget> @@ -309,18 +316,18 @@ </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::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>number1Button</tabstop> @@ -353,11 +360,11 @@ <receiver>SvnRevisionSelectionDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>27</x> <y>512</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>21</x> <y>143</y> </hint> @@ -369,11 +376,11 @@ <receiver>SvnRevisionSelectionDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>79</x> <y>512</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>73</x> <y>140</y> </hint> @@ -385,11 +392,11 @@ <receiver>number1SpinBox</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>62</x> <y>45</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>148</x> <y>43</y> </hint> @@ -401,11 +408,11 @@ <receiver>date1Edit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>70</x> <y>77</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>136</x> <y>74</y> </hint> @@ -417,11 +424,11 @@ <receiver>time1Edit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>16</x> <y>74</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>257</x> <y>74</y> </hint> @@ -433,11 +440,11 @@ <receiver>number2SpinBox</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>32</x> <y>281</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>128</x> <y>283</y> </hint> @@ -449,11 +456,11 @@ <receiver>date2Edit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>49</x> <y>310</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>134</x> <y>310</y> </hint> @@ -465,11 +472,11 @@ <receiver>time2Edit</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>55</x> <y>322</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>264</x> <y>320</y> </hint>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Aug 05 15:58:30 2013 +0200 @@ -83,6 +83,8 @@ self.menuactions.append(self.menu.addAction( self.trUtf8("Show differences"), self.__diff)) self.menuactions.append(self.menu.addAction( + self.trUtf8("Show differences side-by-side"), self.__sbsDiff)) + self.menuactions.append(self.menu.addAction( self.trUtf8("Revert changes"), self.__revert)) self.menuactions.append(self.menu.addAction( self.trUtf8("Restore missing"), self.__restoreMissing)) @@ -333,6 +335,7 @@ self.addButton.setEnabled(False) self.commitButton.setEnabled(False) self.diffButton.setEnabled(False) + self.sbsDiffButton.setEnabled(False) self.revertButton.setEnabled(False) self.restoreButton.setEnabled(False) @@ -595,6 +598,7 @@ self.addButton.setEnabled(unversioned) self.diffButton.setEnabled(modified) + self.sbsDiffButton.setEnabled(modified == 1) self.revertButton.setEnabled(modified) self.restoreButton.setEnabled(missing) @@ -661,6 +665,13 @@ self.__diff() @pyqtSlot() + def on_sbsDiffButton_clicked(self): + """ + Private slot to handle the press of the Side-by-Side Diff button. + """ + self.__sbsDiff() + + @pyqtSlot() def on_revertButton_clicked(self): """ Private slot to handle the press of the Revert button. @@ -805,7 +816,28 @@ self.diff.show() QApplication.processEvents() self.diff.start(names) + + def __sbsDiff(self): + """ + Private slot to handle the Side-by-Side 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("Side-by-Side Diff"), + self.trUtf8("""There are no uncommitted changes""" + """ available/selected.""")) + return + elif len(names) > 1: + E5MessageBox.information(self, + self.trUtf8("Side-by-Side Diff"), + self.trUtf8("""Only one file with uncommitted changes""" + """ must be selected.""")) + return + self.vcs.svnSbsDiff(names[0]) + def __lock(self): """ Private slot to handle the Lock context menu entry.
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui Mon Aug 05 15:58:30 2013 +0200 @@ -182,6 +182,16 @@ </widget> </item> <item> + <widget class="QPushButton" name="sbsDiffButton"> + <property name="toolTip"> + <string>Show differences of the selected entry to the repository in a side-by-side manner</string> + </property> + <property name="text"> + <string>Side-b&y-Side Diff</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> @@ -319,6 +329,7 @@ <tabstop>commitButton</tabstop> <tabstop>addButton</tabstop> <tabstop>diffButton</tabstop> + <tabstop>sbsDiffButton</tabstop> <tabstop>revertButton</tabstop> <tabstop>restoreButton</tabstop> <tabstop>errors</tabstop>
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon Aug 05 13:17:51 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon Aug 05 15:58:30 2013 +0200 @@ -89,6 +89,7 @@ self.log = None self.diff = None + self.sbsDiff = None self.status = None self.propList = None self.tagbranchList = None @@ -121,6 +122,8 @@ self.log.close() if self.diff is not None: self.diff.close() + if self.sbsDiff is not None: + self.sbsDiff.close() if self.status is not None: self.status.close() if self.propList is not None: @@ -831,6 +834,7 @@ @param name file/directory name to show the log of (string) """ + isFile = os.path.isfile(name) noEntries, ok = QInputDialog.getInt( None, self.trUtf8("Subversion Log"), @@ -838,7 +842,7 @@ self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) if ok: from .SvnLogDialog import SvnLogDialog - self.log = SvnLogDialog(self) + self.log = SvnLogDialog(self, isFile=isFile) self.log.show() self.log.start(name, noEntries) @@ -1831,15 +1835,115 @@ QApplication.processEvents() self.diff.start(name, urls=urls, summary=summary) - def svnLogBrowser(self, path): + def __svnGetFileForRevision(self, name, rev=""): + """ + Private method to get a file for a specific revision from the repository. + + @param name file name to get from the repository (string) + @keyparam rev revision to retrieve (integer or string) + @return contents of the file (string) and an error message (string) + """ + args = [] + args.append("cat") + if rev: + args.append("--revision") + args.append(str(rev)) + args.append(name) + + output = "" + error = "" + + process = QProcess() + process.start('svn', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished: + if process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') + else: + error = str(process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') + else: + error = self.trUtf8("The svn process did not finish within 30s.") + else: + error = self.trUtf8('The process {0} could not be started. ' + 'Ensure, that it is in the search path.').format('svn') + + return output, error + + def svnSbsDiff(self, name, extended=False, revisions=None): + """ + Public method used to view the difference of a file to the Mercurial repository + side-by-side. + + @param name file name to be diffed (string) + @keyparam extended flag indicating the extended variant (boolean) + @keyparam revisions tuple of two revisions (tuple of strings) + """ + if isinstance(name, list): + raise ValueError("Wrong parameter type") + + if extended: + from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog + dlg = SvnRevisionSelectionDialog() + if dlg.exec_() == QDialog.Accepted: + rev1, rev2 = dlg.getRevisions() + if rev1 == "WORKING": + rev1 = "" + if rev2 == "WORKING": + rev2 = "" + elif revisions: + rev1, rev2 = revisions[0], revisions[1] + else: + rev1, rev2 = "", "" + + output1, error = self.__svnGetFileForRevision(name, rev=rev1) + if error: + E5MessageBox.critical(self.__ui, + self.trUtf8("Subversion Side-by-Side Difference"), + error) + return + name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or ".") + + if rev2: + output2, error = self.__svnGetFileForRevision(name, rev=rev2) + if error: + E5MessageBox.critical(self.__ui, + self.trUtf8("Subversion Side-by-Side Difference"), + error) + return + name2 = "{0} (rev. {1})".format(name, rev2) + else: + try: + f1 = open(name, "r", encoding="utf-8") + output2 = f1.read() + f1.close() + name2 = name + except IOError: + E5MessageBox.critical(self.__ui, + self.trUtf8("Subversion Side-by-Side Difference"), + self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""") + .format(name)) + return + + if self.sbsDiff is None: + from UI.CompareDialog import CompareDialog + self.sbsDiff = CompareDialog() + self.sbsDiff.show() + self.sbsDiff.compare(output1, output2, name1, name2) + + def svnLogBrowser(self, path, isFile=False): """ Public method used to browse the log of a file/directory from the Subversion repository. @param path file/directory name to show the log of (string) + @param isFile flag indicating log for a file is to be shown (boolean) """ from .SvnLogBrowserDialog import SvnLogBrowserDialog - self.logBrowser = SvnLogBrowserDialog(self) + self.logBrowser = SvnLogBrowserDialog(self, isFile=isFile) self.logBrowser.show() self.logBrowser.start(path)
--- a/changelog Mon Aug 05 13:17:51 2013 +0200 +++ b/changelog Mon Aug 05 15:58:30 2013 +0200 @@ -69,6 +69,8 @@ --- editing the config file will generate a minimal one if none exists --- added support for the 'summary' command --- added capability to compare files side-by-side + -- Subversion + --- added capability to compare files side-by-side - Web Browser -- reworked the various SSL info widgets to show more info -- added a dialog to configure hosts to be exempted from caching
--- a/i18n/eric5_cs.ts Mon Aug 05 13:17:51 2013 +0200 +++ b/i18n/eric5_cs.ts Mon Aug 05 15:58:30 2013 +0200 @@ -18605,42 +18605,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="233"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="350"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -18650,47 +18650,47 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="610"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="739"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="937"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1246"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1442"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -18705,112 +18705,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2137"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2337"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -18820,157 +18820,157 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2405"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2569"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2609"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3048"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2683"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="927"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2894"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -46115,182 +46115,182 @@ <context> <name>Subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/> <source>Create project in repository</source> <translation>Vytvořit projekt v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Projekt nemůže být v repozitáři vytvořen. Buďto daný repozitář neexistuje nebo se nelze připojit k serveru s repozitářem.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> <source>New project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Projekt se nepodařilo stáhnout (checkout) z repozitáře. <br />Obnovuji původní obsah.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="288"/> <source>Importing project into Subversion repository</source> <translation>Importovat projekt do Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="338"/> <source>Subversion Checkout</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Tag musí být normální tag (tagy) nebo tag větve (větví). Prosím vyberte ze seznamu.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="359"/> <source>Checking project out of Subversion repository</source> <translation>Checkout projektu ze Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/> <source>Subversion Export</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="420"/> <source>Exporting project from Subversion repository</source> <translation>Exportuje projekt z Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="537"/> <source>Commiting changes to Subversion repository</source> <translation>Commit změn do Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="593"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronizovat se Subversion repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="694"/> <source>Adding files/directories to the Subversion repository</source> <translation>Přidat soubory/adresáře do Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="792"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="793"/> <source>Adding directory trees to the Subversion repository</source> <translation>Přidat strom adresářů do Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="828"/> <source>Removing files/directories from the Subversion repository</source> <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1157"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="999"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace tagování bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1024"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace tagování bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1105"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1130"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1132"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1157"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1707"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1814"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1816"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1848"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1850"/> <source>You have to supply a property name. Aborting.</source> <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1868"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1688"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1690"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="932"/> <source>Subversion Log</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="932"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2039"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2144"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2182"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1830"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1832"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1881"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1883"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2019"/> - <source>Subversion Lock</source> - <translation>Subversion zámek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2019"/> - <source>Enter lock comment</source> - <translation>Zadejte komentář zámku</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2124"/> + <source>Subversion Lock</source> + <translation>Subversion zámek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2124"/> + <source>Enter lock comment</source> + <translation>Zadejte komentář zámku</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2229"/> <source>Relocating</source> <translation></translation> </message> @@ -46445,37 +46445,37 @@ <translation>mimo verzi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="172"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1869"/> <source>The svn process did not finish within 30s.</source> <translation>Proces svn neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="175"/> <source>Could not start the svn executable.</source> <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2150"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2255"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2150"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2255"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2175"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2280"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2212"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2317"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2306"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -46495,82 +46495,97 @@ <translation>Seznam změn byl přesunut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="170"/> <source>The svn process finished with the exit code {0}</source> <translation>Proces svn skončil exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="891"/> <source>Moving {0}</source> <translation>Přesun {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1059"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1179"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1280"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1282"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1559"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1745"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1747"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="304"/> <source>Imported revision {0}. </source> <translation>Inportovaná revize {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="561"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="562"/> <source>Committed revision {0}.</source> <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1186"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="495"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="495"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1871"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2090"/> + <source>Subversion Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2090"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> + </message> </context> <context> <name>SubversionPage</name> @@ -47480,12 +47495,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="559"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="556"/> <source>Author</source> <translation>Autor</translation> </message> @@ -47495,7 +47510,7 @@ <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="56"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -47555,77 +47570,77 @@ <translation>&Porovnat revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="86"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="87"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="434"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="295"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="301"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion log chyb</b><p>Zobrazí možné chyby z příkazu svn log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="307"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="317"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> <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/SvnLogBrowserDialog.ui" line="332"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="335"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <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/SvnLogBrowserDialog.ui" line="349"/> - <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do módu hesla</translation> + <source>&Send</source> + <translation>Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="345"/> + <source>Alt+S</source> + <translation></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="352"/> + <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/SvnLogBrowserDialog.ui" line="359"/> + <source>Select to switch the input field to password mode</source> + <translation>Vybrat pro přepnutí vstupního pole do módu hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> <source>&Password Mode</source> <translation>Mód ve&psání hesla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="365"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="245"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -47670,15 +47685,25 @@ <translation>Zatavit kopírování/přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="245"/> <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/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="88"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="280"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name> @@ -47698,114 +47723,124 @@ <translation><b>Subversion Log</b><p>Zobrazuje výstup z subversion log příkazu. Kliknutím na odkazy můžete zobrazit rozdíly mezi verzemi.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="58"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="64"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion log chyba</b><p>Zobrazí možné chyby z příkazu svn log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <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/SvnLogDialog.ui" line="95"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="98"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> - <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/SvnLogDialog.ui" line="112"/> - <source>Select to switch the input field to password mode</source> - <translation>Výběr přepnutí vstupního pole na mód zadání hesla</translation> + <source>&Send</source> + <translation>Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> + <source>Alt+S</source> + <translation></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> + <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/SvnLogDialog.ui" line="122"/> + <source>Select to switch the input field to password mode</source> + <translation>Výběr přepnutí vstupního pole na mód zadání hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> <translation>Mód ve&psání hesla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="49"/> <source><b>Processing your request, please wait...</b></source> <translation><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="54"/> - <source>Added</source> - <translation>Přidáno</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="55"/> - <source>Deleted</source> - <translation>Smazáno</translation> + <source>Added</source> + <translation>Přidáno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="56"/> + <source>Deleted</source> + <translation>Smazáno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="57"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="60"/> <source>revision</source> <translation>revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="130"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="130"/> <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/SvnLogDialog.py" line="137"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="140"/> <source>diff to {0}</source> <translation>diff na {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="148"/> <source><i>author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="151"/> <source><i>date: {0}</i><br /> </source> <translation><i>datum: {0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="168"/> <source> (copied from {0}, revision {1})</source> <translation> (zkopírováno z {0}, revize {1})</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="42"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="45"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLoginDialog</name> @@ -48138,32 +48173,32 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="590"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Commitovat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="357"/> <source>Add tree to repository</source> <translation>Přidat stromovou strukturu do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> @@ -48178,7 +48213,7 @@ <translation type="obsolete">Přesunout v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> @@ -48188,32 +48223,32 @@ <translation type="obsolete">Zobrazit limitovaný log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="275"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="627"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Sloučit změny</translation> </message> @@ -48223,105 +48258,115 @@ <translation type="obsolete">Vyřešit konflikty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Lock</source> <translation>Zamknout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Unlock</source> <translation>Odemknout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Break Lock</source> <translation>Prolomit zámek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="397"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="404"/> <source>Steal Lock</source> <translation>Scizit zámek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> - <source>Set Property</source> - <translation>Nastavit vlastnosti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> - <source>List Properties</source> - <translation>Seznam vlastností</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> - <source>Delete Property</source> - <translation>Smazat vlastnost</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> - <source>Select all local file entries</source> - <translation>Vybrat všechny lokální soubory</translation> + <source>Set Property</source> + <translation>Nastavit vlastnosti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> - <source>Select all versioned file entries</source> - <translation>Vybrat všechny soubory ve správě verzí</translation> + <source>List Properties</source> + <translation>Seznam vlastností</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> - <source>Select all local directory entries</source> - <translation>Vybrat všechny lokální adresáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="649"/> - <source>Select all versioned directory entries</source> - <translation>Vybrat všechny adresáře ve správě verzí</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> - <source>Show repository info</source> - <translation>Zobrazit info o repozitáři</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> - <source>Show difference (URLs)</source> - <translation>Zobrazit odlišnosti (URL)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> - <source>Show log browser</source> - <translation>Zobrazit log prohlížeč</translation> + <source>Delete Property</source> + <translation>Smazat vlastnost</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> + <source>Select all local file entries</source> + <translation>Vybrat všechny lokální soubory</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> + <source>Select all versioned file entries</source> + <translation>Vybrat všechny soubory ve správě verzí</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> + <source>Select all local directory entries</source> + <translation>Vybrat všechny lokální adresáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> + <source>Select all versioned directory entries</source> + <translation>Vybrat všechny adresáře ve správě verzí</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> + <source>Show repository info</source> + <translation>Zobrazit info o repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> + <source>Show difference (URLs)</source> + <translation>Zobrazit odlišnosti (URL)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> + <source>Show log browser</source> + <translation>Zobrazit log prohlížeč</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="503"/> <source>Move</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="260"/> + <source>Show difference side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="267"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -49275,107 +49320,107 @@ <context> <name>SvnRevisionSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="13"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="14"/> <source>Subversion Diff</source> <translation>Subversion Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="243"/> <source>Enter a revision number</source> <translation>Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="22"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="23"/> <source>Revision &1</source> <translation>Revize &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="178"/> <source>Select revision before last commit</source> <translation>Vybrat revizi před posledním zápisem změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="181"/> <source>PREV</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="188"/> <source>Select last committed revision</source> <translation>Vybrat poslení komitnutou revizi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="191"/> <source>COMMITTED</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="198"/> <source>Select base revision</source> <translation>Vybrat bázovou revizi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="201"/> <source>BASE</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="208"/> <source>Select head revision of repository</source> <translation>Vybrat poslední revizi v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="211"/> <source>HEAD</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="221"/> <source>Select working revision</source> <translation>Vybrat pracovní revizi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="224"/> <source>WORKING</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="262"/> <source>Enter time of revision</source> <translation>Zadejte čas revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="272"/> <source>Enter date of revision</source> <translation>Zadejte datum revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="275"/> <source>yyyy-MM-dd</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="298"/> <source>Select to specify a revision by number</source> <translation>Vybrat pro zadání revize číslem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="294"/> - <source>Number</source> - <translation>Číslo</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="301"/> + <source>Number</source> + <translation>Číslo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="308"/> <source>Select to specify a revision by date and time</source> <translation>Vybrat pro zadání revize datumem a časem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="311"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="172"/> <source>Revision &2</source> <translation>Revize &2</translation> </message> @@ -49383,7 +49428,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="281"/> <source>Subversion Status</source> <translation></translation> </message> @@ -49450,47 +49495,47 @@ <translation>Cesta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="241"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="257"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="279"/> <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="272"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="282"/> - <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="289"/> - <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> + <source>&Send</source> + <translation>Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> + <source>Alt+S</source> + <translation></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> + <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="299"/> + <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="302"/> <source>&Password Mode</source> <translation>Mód ve&psání hesla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="305"/> <source>Alt+P</source> <translation></translation> </message> @@ -49510,152 +49555,152 @@ <translation>Komitnout změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="737"/> <source>Lock</source> <translation>Zamknout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> <source>Unlock</source> <translation>Odemknout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="110"/> <source>Break lock</source> <translation>Prolomit zámek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="113"/> <source>Steal lock</source> <translation>Zcizit zámek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="117"/> <source>Adjust column sizes</source> <translation>Přizpůsobit šířky sloupců</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>added</source> <translation>přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> - <source>deleted</source> - <translation>smazáno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="162"/> - <source>modified</source> - <translation>změněno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> - <source>locked</source> - <translation>zamčeno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> - <source>other lock</source> - <translation>jiný zámek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> - <source>stolen lock</source> - <translation>scizený zámek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> - <source>broken lock</source> - <translation>prolomený zámek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>not locked</source> - <translation>nezamčeno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>normal</source> - <translation>normální</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> - <source>replaced</source> - <translation>nahrazeno</translation> + <source>deleted</source> + <translation>smazáno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> + <source>modified</source> + <translation>změněno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> + <source>locked</source> + <translation>zamčeno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>other lock</source> + <translation>jiný zámek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="159"/> + <source>stolen lock</source> + <translation>scizený zámek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="160"/> + <source>broken lock</source> + <translation>prolomený zámek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> + <source>not locked</source> + <translation>nezamčeno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> - <source>conflict</source> - <translation>konflikt</translation> + <source>normal</source> + <translation>normální</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>external</source> - <translation>externí</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> - <source>ignored</source> - <translation>ignorováno</translation> + <source>replaced</source> + <translation>nahrazeno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>konflikt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> - <source>unversioned</source> - <translation>mimo verzi</translation> + <source>external</source> + <translation>externí</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> - <source>missing</source> - <translation>chybějící</translation> + <source>ignored</source> + <translation>ignorováno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>mimo verzi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>missing</source> + <translation>chybějící</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> <source>type error</source> <translation>chyba typu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="163"/> <source>no</source> <translation>ne</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="164"/> <source>yes</source> <translation>ano</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="392"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="596"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> <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="705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="737"/> <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="755"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> <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="738"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="770"/> <source>Break Lock</source> <translation>Prolomit zámek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> <source>Steal Lock</source> <translation>Scizit zámek</translation> </message> @@ -49665,22 +49710,22 @@ <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="635"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="635"/> <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="668"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="679"/> <source>Revert</source> <translation>Vrátit</translation> </message> @@ -49690,27 +49735,27 @@ <translation>Seznam změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="99"/> <source>Add to Changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="821"/> <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="803"/> <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="789"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="821"/> <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="389"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="392"/> <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> @@ -49755,22 +49800,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> <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>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="210"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="213"/> <source>&Restore</source> <translation type="unfinished"></translation> </message> @@ -49780,12 +49825,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="95"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="508"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -49795,17 +49840,17 @@ <translation type="obsolete">Odlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="696"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="596"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="679"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished">Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -49819,6 +49864,31 @@ <source>Deselect all from commit</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <source>Show differences of the selected entry to the repository in a side-by-side manner</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> + <source>Side-b&y-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="722"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="722"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnStatusMonitorThread</name> @@ -62800,23 +62870,23 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1307"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1951"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1323"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -62834,23 +62904,23 @@ <translation type="obsolete"><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -62858,12 +62928,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1357"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -63118,17 +63188,17 @@ <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1639"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1641"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1513"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuální revize</b></td><td>{2}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{3}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{4}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Poslední autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1640"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1642"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuální revize</b></td><td>{4}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{6}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{7}</td></tr><tr><td><b>Poslední autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_de.ts Mon Aug 05 13:17:51 2013 +0200 +++ b/i18n/eric5_de.ts Mon Aug 05 15:58:30 2013 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1944,8 +1943,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> </context> <context> @@ -2181,8 +2180,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="87"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -14861,8 +14860,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1025"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> @@ -17956,352 +17955,352 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <source>The hg process did not finish within 30s.</source> + <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="233"/> + <source>Could not start the hg executable.</source> + <translation>Das hg Programm konnte nicht gestartet werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/> + <source>Create project repository</source> + <translation>Projektrepository anlegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/> + <source>The project repository could not be created.</source> + <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <source>Creating Mercurial repository</source> + <translation>Lege Mercurial-Repository an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <source>Initial commit to Mercurial repository</source> + <translation>Erstes Commit für das Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="350"/> + <source>Cloning project from a Mercurial repository</source> + <translation>Klone das Projekt aus dem Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> + <source>Synchronizing with the Mercurial repository</source> + <translation>Gleiche mit dem Mercurial-Repository ab</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="610"/> + <source>Adding files/directories to the Mercurial repository</source> + <translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> + <source>Removing files/directories from the Mercurial repository</source> + <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="739"/> + <source>Renaming {0}</source> + <translation>Benenne {0} um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <source>Taging in the Mercurial repository</source> + <translation>Marke im Mercurial-Repository setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="937"/> + <source>Reverting changes</source> + <translation>Mache Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> + <source>Merging</source> + <translation>Zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1246"/> + <source>Mercurial command</source> + <translation>Mercurial-Befehl</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1442"/> + <source>Copying {0}</source> + <translation>Kopiere {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818"/> + <source>Pulling from a remote Mercurial repository</source> + <translation>Pull von einem entfernten Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> + <source>Pushing to a remote Mercurial repository</source> + <translation>Push in ein entferntes Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <source>Resolving files/directories</source> + <translation>Löse Dateien/Verzeichnisse auf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> + <source>Create Branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> + <source>Enter branch name</source> + <translation>Gib den Zweignamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> + <source>Creating branch in the Mercurial repository</source> + <translation>Erzeuge Zweig im Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <source>Verifying the integrity of the Mercurial repository</source> + <translation>Verifiziere die Integrität des Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2137"/> + <source>Showing the combined configuration settings</source> + <translation>Zeige die kombinierten Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <source>Showing aliases for remote repositories</source> + <translation>Zeige Namen für entfernte Repositorys</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> + <source>Recovering from interrupted transaction</source> + <translation>Setze abgebrochene Transaktion zurück</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> + <source>Shall the working directory be updated?</source> + <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <source>Showing current branch</source> + <translation>Zeige aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2337"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial-Bisect ({0})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> + <source>Identifying project directory</source> + <translation>Projektverzeichnis identifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <source>Create .hgignore file</source> + <translation>.hgignore-Datei erstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2405"/> + <source>Identifying changegroup file</source> + <translation>Identifiziere Änderungsgruppendatei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/> + <source>Backing out changeset</source> + <translation>Änderungssatz umkehren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2569"/> + <source>No revision given. Aborting...</source> + <translation>Keine Revision angegeben. Abbruch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <source>Rollback last transaction</source> + <translation>Letzte Transaktion zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2609"/> + <source>Are you sure you want to rollback the last transaction?</source> + <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <source>Committing changes to Mercurial repository</source> + <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> + <source>Mercurial Command Server</source> + <translation>Mercurial-Befehlsserver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3048"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2683"/> + <source>Import Patch</source> + <translation>Patch importieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> + <source>Export Patches</source> + <translation>Patches exportieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <source>Change Phase</source> + <translation>Phase ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> + <source>Copy Changesets (Continue)</source> + <translation>Änderungssätze kopieren (Fortsetzung)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <source>Add Sub-repository</source> + <translation>Unterrepository hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> + <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019"/> + <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> + <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019"/> + <source>Remove Sub-repositories</source> + <translation>Unterrepositorys löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> + <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/> + <source>Commit Changes</source> + <translation>Änderungen einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/> + <source>Do you really want to revert all changes of the project?</source> + <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2894"/> + <source>Create Unversioned Archive</source> + <translation>Erzeuge nicht versioniertes Archiv</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/> + <source>Mercurial Side-by-Side Difference</source> + <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> - <source>The hg process did not finish within 30s.</source> - <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> - <source>Could not start the hg executable.</source> - <translation>Das hg Programm konnte nicht gestartet werden.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> - <source>Create project repository</source> - <translation>Projektrepository anlegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> - <source>The project repository could not be created.</source> - <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> - <source>Creating Mercurial repository</source> - <translation>Lege Mercurial-Repository an</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> - <source>Initial commit to Mercurial repository</source> - <translation>Erstes Commit für das Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> - <source>Cloning project from a Mercurial repository</source> - <translation>Klone das Projekt aus dem Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> - <source>Synchronizing with the Mercurial repository</source> - <translation>Gleiche mit dem Mercurial-Repository ab</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> - <source>Adding files/directories to the Mercurial repository</source> - <translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> - <source>Removing files/directories from the Mercurial repository</source> - <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> - <source>Renaming {0}</source> - <translation>Benenne {0} um</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="888"/> - <source>Taging in the Mercurial repository</source> - <translation>Marke im Mercurial-Repository setzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/> - <source>Reverting changes</source> - <translation>Mache Änderungen rückgängig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> - <source>Merging</source> - <translation>Zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1248"/> - <source>Mercurial command</source> - <translation>Mercurial-Befehl</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/> - <source>Copying {0}</source> - <translation>Kopiere {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> - <source>Pulling from a remote Mercurial repository</source> - <translation>Pull von einem entfernten Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> - <source>Pushing to a remote Mercurial repository</source> - <translation>Push in ein entferntes Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/> - <source>Resolving files/directories</source> - <translation>Löse Dateien/Verzeichnisse auf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> - <source>Create Branch</source> - <translation>Zweig erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> - <source>Enter branch name</source> - <translation>Gib den Zweignamen ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> - <source>Creating branch in the Mercurial repository</source> - <translation>Erzeuge Zweig im Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> - <source>Verifying the integrity of the Mercurial repository</source> - <translation>Verifiziere die Integrität des Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> - <source>Showing the combined configuration settings</source> - <translation>Zeige die kombinierten Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/> - <source>Showing aliases for remote repositories</source> - <translation>Zeige Namen für entfernte Repositorys</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186"/> - <source>Recovering from interrupted transaction</source> - <translation>Setze abgebrochene Transaktion zurück</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> - <source>Shall the working directory be updated?</source> - <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> - <source>Showing current branch</source> - <translation>Zeige aktuellen Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial-Bisect ({0})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/> - <source>Preview changegroup</source> - <translation>Änderungsgruppe ansehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> - <source>Identifying project directory</source> - <translation>Projektverzeichnis identifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> - <source>Create .hgignore file</source> - <translation>.hgignore-Datei erstellen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2431"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> - <source>Identifying changegroup file</source> - <translation>Identifiziere Änderungsgruppendatei</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/> - <source>Backing out changeset</source> - <translation>Änderungssatz umkehren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> - <source>No revision given. Aborting...</source> - <translation>Keine Revision angegeben. Abbruch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> - <source>Rollback last transaction</source> - <translation>Letzte Transaktion zurücksetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> - <source>Are you sure you want to rollback the last transaction?</source> - <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> - <source>Committing changes to Mercurial repository</source> - <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> - <source>Mercurial Command Server</source> - <translation>Mercurial-Befehlsserver</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/> - <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> - <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> - <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> - <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> - <source>Import Patch</source> - <translation>Patch importieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> - <source>Export Patches</source> - <translation>Patches exportieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> - <source>Change Phase</source> - <translation>Phase ändern</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> - <source>Copy Changesets</source> - <translation>Änderungssätze kopieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2861"/> - <source>Copy Changesets (Continue)</source> - <translation>Änderungssätze kopieren (Fortsetzung)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> - <source>Add Sub-repository</source> - <translation>Unterrepository hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2958"/> - <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> - <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> - <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> - <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> - <source>Remove Sub-repositories</source> - <translation>Unterrepositorys löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> - <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> - <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> - <source>Commit Changes</source> - <translation>Änderungen einpflegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> - <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> - <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="927"/> - <source>Do you really want to revert all changes to these files or directories?</source> - <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> - <source>Do you really want to revert all changes of the project?</source> - <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> - <source>Create Unversioned Archive</source> - <translation>Erzeuge nicht versioniertes Archiv</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> - <source>Mercurial Side-by-Side Difference</source> - <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> - <source><p>The file <b>{0}</b> could not be read.</p></source> - <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1677"/> <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> @@ -44372,224 +44371,224 @@ <context> <name>Subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="288"/> <source>Importing project into Subversion repository</source> <translation>Lade das Projekt in das Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="338"/> <source>Subversion Checkout</source> <translation>Subversion-Checkout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="359"/> <source>Checking project out of Subversion repository</source> <translation>Lade das Projekt aus dem Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="420"/> <source>Exporting project from Subversion repository</source> <translation>Expotiere das Projekt aus dem Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1157"/> <source>Subversion Error</source> <translation>Subversion-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="999"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Die URL des Projektrepositorys konnte nicht aus der Arbeitskopie ermittelt werden. Die Tag-Operation wird abgebrochen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1024"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Die URL des Projektrepositorys hat ein ungültiges Format. Die Tag-Operation wird abgebrochen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1059"/> <source>Tagging {0} in the Subversion repository</source> <translation>Markiere {0} im Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1130"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1132"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Die URL des Projektrepositorys konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1157"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Die URL des Projektrepositorys hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1179"/> <source>Switching to {0}</source> <translation>Schalte {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1280"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1282"/> <source>Merging {0}</source> <translation>Arbeite Änderungen in {0} ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1559"/> <source>Cleaning up {0}</source> <translation>Räume {0} auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion command</source> <translation>Subversion-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1745"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1747"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="891"/> <source>Moving {0}</source> <translation>Verschiebe {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Das Tag muss ein normales Tag (tags) oder ein Zweigtag (branches) sein. Bitte aus der Liste auswählen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/> <source>Subversion Export</source> <translation>Subversion-Export</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1814"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1816"/> <source>Subversion Set Property</source> <translation>Subversion-Eigenschaft definieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1848"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1850"/> <source>You have to supply a property name. Aborting.</source> <translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1868"/> <source>Subversion Delete Property</source> <translation>Subversion-Eigenschaft löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1688"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1690"/> <source>Enter property name</source> <translation>Gib den Namen der Eigenschaft ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="537"/> <source>Commiting changes to Subversion repository</source> <translation>Pflege Änderungen in das Subversion-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="593"/> <source>Synchronizing with the Subversion repository</source> <translation>Gleiche mit dem Subversion-Repository ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="694"/> <source>Adding files/directories to the Subversion repository</source> <translation>Füge Dateien/Verzeichnisse dem Subversion-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="792"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="793"/> <source>Adding directory trees to the Subversion repository</source> <translation>Füge Verzeichnisbäume dem Subversion-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="828"/> <source>Removing files/directories from the Subversion repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1105"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1707"/> <source>Resolving conficts</source> <translation>Löse Konflikte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/> <source>Create project in repository</source> <translation>Projekt im Repository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Das Projekt konnte nicht im Repository angelegt werden. Vielleicht existiert das angegebene Repository nicht oder der Repositoryserver ist nicht verfügbar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> <source>New project</source> <translation>Neues Projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Das Projekt konnte nicht aus dem Repository geladen werden.<br />Stelle das Original wieder her.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="932"/> <source>Subversion Log</source> <translation>Subversion-Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="932"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2039"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2144"/> <source>Locking in the Subversion repository</source> <translation>Sperren im Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2182"/> <source>Unlocking in the Subversion repository</source> <translation>Entsperren im Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="561"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="562"/> <source>Committed revision {0}.</source> <translation>Revision {0} eingepflegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1186"/> <source>Revision {0}. </source> <translation>Revision {0}. </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1830"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1832"/> <source>Property set.</source> <translation>Eigenschaft definiert.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1881"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1883"/> <source>Property deleted.</source> <translation>Eigenschaft gelöscht.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2019"/> - <source>Subversion Lock</source> - <translation>Subversion-Sperre</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2019"/> - <source>Enter lock comment</source> - <translation>Gib eine Kommentar für die Sperre ein</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2124"/> + <source>Subversion Lock</source> + <translation>Subversion-Sperre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2124"/> + <source>Enter lock comment</source> + <translation>Gib eine Kommentar für die Sperre ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2229"/> <source>Relocating</source> <translation>Relozierung</translation> </message> @@ -44744,49 +44743,49 @@ <translation>unversioniert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="304"/> <source>Imported revision {0}. </source> <translation>Revision {0} importiert. </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="170"/> <source>The svn process finished with the exit code {0}</source> <translation>Der svn-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="172"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1869"/> <source>The svn process did not finish within 30s.</source> <translation>Der svn-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="175"/> <source>Could not start the svn executable.</source> <translation>Das svn-Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2150"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2255"/> <source>Repository Browser</source> <translation>Repositorybrowser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2150"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2255"/> <source>Enter the repository URL.</source> <translation>Gib die URL des Repository ein.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2175"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2280"/> <source>Remove from changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2212"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2317"/> <source>Add to changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2306"/> <source>Enter name of the changelist:</source> <translation>Gib den Namen der Änderungsliste ein:</translation> </message> @@ -44806,30 +44805,45 @@ <translation>Zur Änderungsliste verschoben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="495"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="495"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Dateien oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1871"/> + <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/subversion.py" line="2090"/> + <source>Subversion Side-by-Side Difference</source> + <translation>Subversion Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2090"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> + </message> </context> <context> <name>SubversionPage</name> @@ -45712,12 +45726,12 @@ <translation>Subversion-Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="559"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="556"/> <source>Author</source> <translation>Autor</translation> </message> @@ -45727,7 +45741,7 @@ <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="56"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -45787,82 +45801,82 @@ <translation>&Vergleiche Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="86"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="87"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="434"/> <source>Subversion Error</source> <translation>Subversion-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="295"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="301"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des svn log-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="307"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="317"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> <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/SvnLogBrowserDialog.ui" line="332"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="335"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <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/SvnLogBrowserDialog.ui" line="349"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="345"/> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="352"/> + <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/SvnLogBrowserDialog.ui" line="359"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> <source>&Password Mode</source> <translation>&Kennwortmodus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="365"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="245"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="245"/> <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> @@ -45907,35 +45921,45 @@ <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="88"/> <source>Replaced</source> <translation>Ersetzt</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <source>Select to show differences side-by-side</source> + <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="280"/> + <source>Show differences side-by-side</source> + <translation>Unterschiede nebeneinander anzeigen</translation> + </message> </context> <context> <name>SvnLogDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="55"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="55"/> - <source>Deleted</source> - <translation>Gelöscht</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="56"/> + <source>Deleted</source> + <translation>Gelöscht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="57"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="60"/> <source>revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="137"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="140"/> <source>diff to {0}</source> <translation>Unterschied zu {0}</translation> </message> @@ -45955,89 +45979,99 @@ <translation><b>Subversion-Log</b><p>Dies zeigt die Ausgabe des svn log-Befehls. Durch Anklicken der Verweise kann der Unterschied zwischen den Versionen angezeigt werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="58"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="64"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des svn log-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <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/SvnLogDialog.ui" line="95"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="98"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> - <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/SvnLogDialog.ui" line="112"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> + <source>Alt+S</source> + <translation>Alt+D</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> + <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/SvnLogDialog.ui" line="122"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> <translation>&Kennwortmodus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="130"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="148"/> <source><i>author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="151"/> <source><i>date: {0}</i><br /> </source> <translation><i>Datum: {0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="168"/> <source> (copied from {0}, revision {1})</source> <translation> (kopiert von {0}, Revision {1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="49"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Verarbeite Ihre Anfrage, bitte warten...</b></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="130"/> <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/SvnLogDialog.ui" line="42"/> + <source>Select to show differences side-by-side</source> + <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="45"/> + <source>Show differences side-by-side</source> + <translation>Unterschiede nebeneinander anzeigen</translation> + </message> </context> <context> <name>SvnLoginDialog</name> @@ -46371,170 +46405,180 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="590"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="357"/> <source>Add tree to repository</source> <translation>Verzeichnisbaum zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> - <source>Show status</source> - <translation>Status anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> + <source>Show status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> + <source>Show difference</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="627"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Änderungen einarbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> - <source>Set Property</source> - <translation>Eigenschaft definieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> - <source>List Properties</source> - <translation>Eigenschaften listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> - <source>Delete Property</source> - <translation>Eigenschaft löschen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> + <source>Set Property</source> + <translation>Eigenschaft definieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> - <source>Select all versioned file entries</source> - <translation>Alle versionierten Dateieinträge auswählen</translation> + <source>List Properties</source> + <translation>Eigenschaften listen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> + <source>Delete Property</source> + <translation>Eigenschaft löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> + <source>Select all versioned file entries</source> + <translation>Alle versionierten Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Lock</source> <translation>Sperren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Unlock</source> <translation>Entsperren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Break Lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="397"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="404"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="275"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> + <source>Show repository info</source> + <translation>Zeige Repositoryinformationen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> + <source>Show difference (URLs)</source> + <translation>Unterschiede anzeigen (URLs)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> - <source>Show repository info</source> - <translation>Zeige Repositoryinformationen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> - <source>Show difference (URLs)</source> - <translation>Unterschiede anzeigen (URLs)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Conflict resolved</source> <translation>Konflikt gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="503"/> <source>Move</source> <translation>Verschieben</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="260"/> + <source>Show difference side-by-side</source> + <translation>Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="267"/> + <source>Show difference side-by-side (extended)</source> + <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -47413,107 +47457,107 @@ <context> <name>SvnRevisionSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="13"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="14"/> <source>Subversion Diff</source> <translation>Subversion-Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="243"/> <source>Enter a revision number</source> <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="22"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="23"/> <source>Revision &1</source> <translation>Revision &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="178"/> <source>Select revision before last commit</source> <translation>Wähle Revision for letztem Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="181"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="188"/> <source>Select last committed revision</source> <translation>Wähle Revision des letzten Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="191"/> <source>COMMITTED</source> <translation>COMMITTED</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="198"/> <source>Select base revision</source> <translation>Wähle Basisrevision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="201"/> <source>BASE</source> <translation>BASE</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="208"/> <source>Select head revision of repository</source> <translation>Wähle die Revision des Kopfes des Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="211"/> <source>HEAD</source> <translation>HEAD</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="221"/> <source>Select working revision</source> <translation>Wähle die Arbeitsrevision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="224"/> <source>WORKING</source> <translation>WORKING</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="262"/> <source>Enter time of revision</source> <translation>Gib die Zeit der Revision ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="272"/> <source>Enter date of revision</source> <translation>Gib das Datum der Revision ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="275"/> <source>yyyy-MM-dd</source> <translation>yyyy-MM-dd</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="298"/> <source>Select to specify a revision by number</source> <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="294"/> - <source>Number</source> - <translation>Nummer</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="301"/> + <source>Number</source> + <translation>Nummer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="308"/> <source>Select to specify a revision by date and time</source> <translation>Auswählen, um eine Revision per Datum und Zeit zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="311"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="172"/> <source>Revision &2</source> <translation>Revision &2</translation> </message> @@ -47521,67 +47565,67 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>added</source> <translation>hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>deleted</source> <translation>gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> <source>modified</source> <translation>modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> <source>conflict</source> <translation>Konflikt</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>unversioniert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>missing</source> + <translation>fehlt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> + <source>type error</source> + <translation>Typfehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="163"/> + <source>no</source> + <translation>nein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="164"/> + <source>yes</source> + <translation>ja</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> - <source>unversioned</source> - <translation>unversioniert</translation> + <source>external</source> + <translation>Extern</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> - <source>missing</source> - <translation>fehlt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> - <source>type error</source> - <translation>Typfehler</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> - <source>no</source> - <translation>nein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> - <source>yes</source> - <translation>ja</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>external</source> - <translation>Extern</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> <source>ignored</source> <translation>ignoriert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="281"/> <source>Subversion Status</source> <translation>Subversion-Status</translation> </message> @@ -47591,82 +47635,82 @@ <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="596"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> <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="705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="737"/> <source>Lock</source> <translation>Sperren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> <source>Unlock</source> <translation>Entsperren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="110"/> <source>Break lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="113"/> <source>Steal lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> <source>locked</source> <translation>gesperrt</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>other lock</source> + <translation>fremdgesperrt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="159"/> + <source>stolen lock</source> + <translation>Sperre gestohlen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="160"/> + <source>broken lock</source> + <translation>Sperre gebrochen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> - <source>other lock</source> - <translation>fremdgesperrt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> - <source>stolen lock</source> - <translation>Sperre gestohlen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> - <source>broken lock</source> - <translation>Sperre gebrochen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> <source>not locked</source> <translation>nicht gesperrt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>replaced</source> <translation>ersetzt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="737"/> <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="755"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> <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="738"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="770"/> <source>Break Lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> @@ -47733,47 +47777,47 @@ <translation>Pfad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="241"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="257"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="279"/> <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="272"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="282"/> - <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="289"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> + <source>Alt+S</source> + <translation>Alt+D</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> + <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="299"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="302"/> <source>&Password Mode</source> <translation>&Kennwortmodus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="305"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -47783,12 +47827,12 @@ <translation>Drücken, um die Statusanzeige zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="117"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="392"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> @@ -47803,27 +47847,27 @@ <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="635"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="635"/> <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="668"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="679"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="392"/> <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> @@ -47833,22 +47877,22 @@ <translation>Änderungsliste</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="99"/> <source>Add to Changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="821"/> <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="803"/> <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="789"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="821"/> <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> @@ -47893,22 +47937,22 @@ <translation>&Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> <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>Re&vert</source> + <translation>&Rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="210"/> + <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="213"/> <source>&Restore</source> <translation>&Wiederherstellen</translation> </message> @@ -47918,27 +47962,27 @@ <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="95"/> <source>Restore missing</source> <translation>Fehlende wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="508"/> <source>all</source> <translation>alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="696"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="596"/> <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="668"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="679"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -47952,6 +47996,31 @@ <source>Deselect all from commit</source> <translation>Alle vom Einpflegen abwählen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <source>Show differences of the selected entry to the repository in a side-by-side manner</source> + <translation>Zeigt die Unterschiede der ausgewählten Einträge zum Repository nebeneinander</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> + <source>Side-b&y-Side Diff</source> + <translation>Unterschiede &nebeneinander</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Show differences side-by-side</source> + <translation>Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="722"/> + <source>Side-by-Side Diff</source> + <translation>Unterschiede nebeneinander</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="722"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation>Es darf nur eine Datei ausgewählt werden.</translation> + </message> </context> <context> <name>SvnStatusMonitorThread</name> @@ -59918,24 +59987,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1307"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1951"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1323"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -59944,24 +60013,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -59972,12 +60041,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1357"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -60232,17 +60301,17 @@ <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1513"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Repositoryinformationen</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{2}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{3}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{4}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{5}</td></tr><tr><td><b>Letzter Autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1639"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1641"/> <source>unknown</source> <translation>Unbekannt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1640"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1642"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Repositoryinformationen</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{4}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{5}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{6}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{7}</td></tr><tr><td><b>Letzter Autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_en.ts Mon Aug 05 13:17:51 2013 +0200 +++ b/i18n/eric5_en.ts Mon Aug 05 15:58:30 2013 +0200 @@ -17857,352 +17857,352 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="233"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/> + <source>Create project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/> + <source>The project repository could not be created.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <source>Creating Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <source>Initial commit to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="350"/> + <source>Cloning project from a Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> + <source>Synchronizing with the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="610"/> + <source>Adding files/directories to the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> + <source>Removing files/directories from the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="739"/> + <source>Renaming {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <source>Taging in the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="937"/> + <source>Reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> + <source>Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1246"/> + <source>Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1442"/> + <source>Copying {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818"/> + <source>Pulling from a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> + <source>Pushing to a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <source>Resolving files/directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> + <source>Enter branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> + <source>Creating branch in the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <source>Showing current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <source>Verifying the integrity of the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2137"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <source>Showing aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> + <source>Recovering from interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2337"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2405"/> + <source>Identifying changegroup file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2569"/> + <source>No revision given. Aborting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2609"/> + <source>Are you sure you want to rollback the last transaction?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3048"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2683"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> + <source>Add Sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019"/> + <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019"/> + <source>Remove Sub-repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/> + <source>Commit Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/> + <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2894"/> + <source>Create Unversioned Archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/> + <source>Mercurial Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> - <source>Create project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> - <source>The project repository could not be created.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> - <source>Creating Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> - <source>Initial commit to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> - <source>Cloning project from a Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> - <source>Synchronizing with the Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> - <source>Adding files/directories to the Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> - <source>Removing files/directories from the Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> - <source>Renaming {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="888"/> - <source>Taging in the Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/> - <source>Reverting changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> - <source>Merging</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1248"/> - <source>Mercurial command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/> - <source>Copying {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> - <source>Pulling from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> - <source>Pushing to a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/> - <source>Resolving files/directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> - <source>Create Branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> - <source>Enter branch name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> - <source>Creating branch in the Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> - <source>Showing current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> - <source>Verifying the integrity of the Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> - <source>Showing the combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/> - <source>Showing aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186"/> - <source>Recovering from interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> - <source>Identifying project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> - <source>Create .hgignore file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> - <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2431"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> - <source>Shall the working directory be updated?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> - <source>Removing files from the Mercurial repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/> - <source>Backing out changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> - <source>No revision given. Aborting...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> - <source>Are you sure you want to rollback the last transaction?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> - <source>Committing changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> - <source>Mercurial Command Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/> - <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> - <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2861"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> - <source>Add Sub-repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> - <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2958"/> - <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> - <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> - <source>Remove Sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> - <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> - <source>Commit Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> - <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="927"/> - <source>Do you really want to revert all changes to these files or directories?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> - <source>Create Unversioned Archive</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> - <source>Mercurial Side-by-Side Difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> - <source><p>The file <b>{0}</b> could not be read.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1677"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -43937,269 +43937,269 @@ <context> <name>Subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="170"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="172"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1869"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="175"/> <source>Could not start the svn executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/> <source>Create project in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> <source>New project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="288"/> <source>Importing project into Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="338"/> <source>Subversion Checkout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="359"/> <source>Checking project out of Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/> <source>Subversion Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="420"/> <source>Exporting project from Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="537"/> <source>Commiting changes to Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="593"/> <source>Synchronizing with the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="694"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="792"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="793"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugin