Sat, 03 Sep 2011 16:41:44 +0200
Made "Show Log" behave like "Show Limited Log" and removed the later.
--- a/APIs/Python3/eric5.api Fri Sep 02 08:35:45 2011 +0200 +++ b/APIs/Python3/eric5.api Sat Sep 03 16:41:44 2011 +0200 @@ -3358,7 +3358,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.func?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.isExecuting?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.restartServer?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.runcommand?4(args, prompt=None, input=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.runcommand?4(args, prompt=None, input=None, output=None, error=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.startServer?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.stopServer?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.wasCanceled?4() @@ -3715,7 +3715,6 @@ 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.hgLogLimited?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4(name) @@ -3926,7 +3925,6 @@ 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.svnLogLimited?4(name) 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) @@ -4146,7 +4144,6 @@ 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.svnLogLimited?4(name) 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)
--- a/Documentation/Help/source.qhp Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Help/source.qhp Sat Sep 03 16:41:44 2011 +0200 @@ -8570,7 +8570,6 @@ <keyword name="Hg.hgInfo" id="Hg.hgInfo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgInfo" /> <keyword name="Hg.hgListTagBranch" id="Hg.hgListTagBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgListTagBranch" /> <keyword name="Hg.hgLogBrowser" id="Hg.hgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgLogBrowser" /> - <keyword name="Hg.hgLogLimited" id="Hg.hgLogLimited" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgLogLimited" /> <keyword name="Hg.hgNormalizeURL" id="Hg.hgNormalizeURL" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgNormalizeURL" /> <keyword name="Hg.hgOutgoing" id="Hg.hgOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgOutgoing" /> <keyword name="Hg.hgPreviewBundle" id="Hg.hgPreviewBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPreviewBundle" /> @@ -8671,7 +8670,6 @@ <keyword name="HgProjectHelper.__hgIdentifyBundle" id="HgProjectHelper.__hgIdentifyBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentifyBundle" /> <keyword name="HgProjectHelper.__hgIncoming" id="HgProjectHelper.__hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIncoming" /> <keyword name="HgProjectHelper.__hgLogBrowser" id="HgProjectHelper.__hgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgLogBrowser" /> - <keyword name="HgProjectHelper.__hgLogLimited" id="HgProjectHelper.__hgLogLimited" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgLogLimited" /> <keyword name="HgProjectHelper.__hgOutgoing" id="HgProjectHelper.__hgOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgOutgoing" /> <keyword name="HgProjectHelper.__hgParents" id="HgProjectHelper.__hgParents" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgParents" /> <keyword name="HgProjectHelper.__hgPreviewBundle" id="HgProjectHelper.__hgPreviewBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPreviewBundle" /> @@ -8756,7 +8754,6 @@ <keyword name="HgProjectBrowserHelper.__HgExtendedDiff" id="HgProjectBrowserHelper.__HgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgExtendedDiff" /> <keyword name="HgProjectBrowserHelper.__HgForget" id="HgProjectBrowserHelper.__HgForget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgForget" /> <keyword name="HgProjectBrowserHelper.__HgLogBrowser" id="HgProjectBrowserHelper.__HgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgLogBrowser" /> - <keyword name="HgProjectBrowserHelper.__HgLogLimited" id="HgProjectBrowserHelper.__HgLogLimited" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgLogLimited" /> <keyword name="HgProjectBrowserHelper.__HgMove" id="HgProjectBrowserHelper.__HgMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgMove" /> <keyword name="HgProjectBrowserHelper.__HgResolve" id="HgProjectBrowserHelper.__HgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgResolve" /> <keyword name="HgProjectBrowserHelper._addVCSMenu" id="HgProjectBrowserHelper._addVCSMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenu" /> @@ -9086,7 +9083,6 @@ <keyword name="Subversion.svnListTagBranch" id="Subversion.svnListTagBranch" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnListTagBranch" /> <keyword name="Subversion.svnLock" id="Subversion.svnLock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnLock" /> <keyword name="Subversion.svnLogBrowser" id="Subversion.svnLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnLogBrowser" /> - <keyword name="Subversion.svnLogLimited" id="Subversion.svnLogLimited" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnLogLimited" /> <keyword name="Subversion.svnNormalizeURL" id="Subversion.svnNormalizeURL" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnNormalizeURL" /> <keyword name="Subversion.svnRelocate" id="Subversion.svnRelocate" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnRelocate" /> <keyword name="Subversion.svnRemoveFromChangelist" id="Subversion.svnRemoveFromChangelist" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnRemoveFromChangelist" /> @@ -9133,7 +9129,6 @@ <keyword name="SvnProjectHelper.__svnConfigure" id="SvnProjectHelper.__svnConfigure" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnConfigure" /> <keyword name="SvnProjectHelper.__svnExtendedDiff" id="SvnProjectHelper.__svnExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnExtendedDiff" /> <keyword name="SvnProjectHelper.__svnLogBrowser" id="SvnProjectHelper.__svnLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnLogBrowser" /> - <keyword name="SvnProjectHelper.__svnLogLimited" id="SvnProjectHelper.__svnLogLimited" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnLogLimited" /> <keyword name="SvnProjectHelper.__svnPropDel" id="SvnProjectHelper.__svnPropDel" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnPropDel" /> <keyword name="SvnProjectHelper.__svnPropList" id="SvnProjectHelper.__svnPropList" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnPropList" /> <keyword name="SvnProjectHelper.__svnPropSet" id="SvnProjectHelper.__svnPropSet" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnPropSet" /> @@ -9209,7 +9204,6 @@ <keyword name="SvnProjectBrowserHelper.__SVNListProps" id="SvnProjectBrowserHelper.__SVNListProps" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNListProps" /> <keyword name="SvnProjectBrowserHelper.__SVNLock" id="SvnProjectBrowserHelper.__SVNLock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLock" /> <keyword name="SvnProjectBrowserHelper.__SVNLogBrowser" id="SvnProjectBrowserHelper.__SVNLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLogBrowser" /> - <keyword name="SvnProjectBrowserHelper.__SVNLogLimited" id="SvnProjectBrowserHelper.__SVNLogLimited" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLogLimited" /> <keyword name="SvnProjectBrowserHelper.__SVNMove" id="SvnProjectBrowserHelper.__SVNMove" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNMove" /> <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.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNResolve" /> @@ -9470,7 +9464,6 @@ <keyword name="Subversion.svnListTagBranch" id="Subversion.svnListTagBranch" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnListTagBranch" /> <keyword name="Subversion.svnLock" id="Subversion.svnLock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnLock" /> <keyword name="Subversion.svnLogBrowser" id="Subversion.svnLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnLogBrowser" /> - <keyword name="Subversion.svnLogLimited" id="Subversion.svnLogLimited" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnLogLimited" /> <keyword name="Subversion.svnNormalizeURL" id="Subversion.svnNormalizeURL" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnNormalizeURL" /> <keyword name="Subversion.svnRelocate" id="Subversion.svnRelocate" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnRelocate" /> <keyword name="Subversion.svnRemoveFromChangelist" id="Subversion.svnRemoveFromChangelist" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnRemoveFromChangelist" /> @@ -9518,7 +9511,6 @@ <keyword name="SvnProjectHelper.__svnExtendedDiff" id="SvnProjectHelper.__svnExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnExtendedDiff" /> <keyword name="SvnProjectHelper.__svnInfo" id="SvnProjectHelper.__svnInfo" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnInfo" /> <keyword name="SvnProjectHelper.__svnLogBrowser" id="SvnProjectHelper.__svnLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnLogBrowser" /> - <keyword name="SvnProjectHelper.__svnLogLimited" id="SvnProjectHelper.__svnLogLimited" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnLogLimited" /> <keyword name="SvnProjectHelper.__svnPropDel" id="SvnProjectHelper.__svnPropDel" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnPropDel" /> <keyword name="SvnProjectHelper.__svnPropList" id="SvnProjectHelper.__svnPropList" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnPropList" /> <keyword name="SvnProjectHelper.__svnPropSet" id="SvnProjectHelper.__svnPropSet" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnPropSet" /> @@ -9587,7 +9579,6 @@ <keyword name="SvnProjectBrowserHelper.__SVNListProps" id="SvnProjectBrowserHelper.__SVNListProps" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNListProps" /> <keyword name="SvnProjectBrowserHelper.__SVNLock" id="SvnProjectBrowserHelper.__SVNLock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLock" /> <keyword name="SvnProjectBrowserHelper.__SVNLogBrowser" id="SvnProjectBrowserHelper.__SVNLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLogBrowser" /> - <keyword name="SvnProjectBrowserHelper.__SVNLogLimited" id="SvnProjectBrowserHelper.__SVNLogLimited" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLogLimited" /> <keyword name="SvnProjectBrowserHelper.__SVNMove" id="SvnProjectBrowserHelper.__SVNMove" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNMove" /> <keyword name="SvnProjectBrowserHelper.__SVNRemoveFromChangelist" id="SvnProjectBrowserHelper.__SVNRemoveFromChangelist" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNRemoveFromChangelist" /> <keyword name="SvnProjectBrowserHelper.__SVNResolve" id="SvnProjectBrowserHelper.__SVNResolve" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNResolve" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html Sat Sep 03 16:41:44 2011 +0200 @@ -223,27 +223,36 @@ </dd> </dl><a NAME="HgClient.runcommand" ID="HgClient.runcommand"></a> <h4>HgClient.runcommand</h4> -<b>runcommand</b>(<i>args, prompt=None, input=None</i>) +<b>runcommand</b>(<i>args, prompt=None, input=None, output=None, error=None</i>) <p> Public method to execute a command via the command server. </p><dl> <dt><i>args</i></dt> <dd> list of arguments for the command (list of string) -</dd><dt><i>prompt</i></dt> +</dd><dt><i>prompt=</i></dt> <dd> function to reply to prompts by the server. It receives the max number of bytes to return and the contents of the output channel received so far. -</dd><dt><i>input</i></dt> +</dd><dt><i>input=</i></dt> <dd> function to reply to bulk data requests by the server. It receives the max number of bytes to return. +</dd><dt><i>output=</i></dt> +<dd> +function receiving the data from the server (string). + If a prompt function is given, this parameter will be ignored. +</dd><dt><i>error=</i></dt> +<dd> +function receiving error messages from the server (string) </dd> </dl><dl> <dt>Returns:</dt> <dd> -output and errors of the command server (string) +output and errors of the command server (string). In case output + and/or error functions were given, the respective return value will + be an empty string. </dd> </dl><a NAME="HgClient.startServer" ID="HgClient.startServer"></a> <h4>HgClient.startServer</h4>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Sat Sep 03 16:41:44 2011 +0200 @@ -76,9 +76,6 @@ <td><a href="#HgProjectBrowserHelper.__HgLogBrowser">__HgLogBrowser</a></td> <td>Private slot called by the context menu to show the log browser for a file.</td> </tr><tr> -<td><a href="#HgProjectBrowserHelper.__HgLogLimited">__HgLogLimited</a></td> -<td>Private slot called by the context menu to show the limited log of a file.</td> -</tr><tr> <td><a href="#HgProjectBrowserHelper.__HgMove">__HgMove</a></td> <td>Private slot called by the context menu to move the selected file.</td> </tr><tr> @@ -172,11 +169,6 @@ <b>__HgLogBrowser</b>(<i></i>) <p> Private slot called by the context menu to show the log browser for a file. -</p><a NAME="HgProjectBrowserHelper.__HgLogLimited" ID="HgProjectBrowserHelper.__HgLogLimited"></a> -<h4>HgProjectBrowserHelper.__HgLogLimited</h4> -<b>__HgLogLimited</b>(<i></i>) -<p> - Private slot called by the context menu to show the limited log of a file. </p><a NAME="HgProjectBrowserHelper.__HgMove" ID="HgProjectBrowserHelper.__HgMove"></a> <h4>HgProjectBrowserHelper.__HgMove</h4> <b>__HgMove</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sat Sep 03 16:41:44 2011 +0200 @@ -118,9 +118,6 @@ <td><a href="#HgProjectHelper.__hgLogBrowser">__hgLogBrowser</a></td> <td>Private slot used to browse the log of the current project.</td> </tr><tr> -<td><a href="#HgProjectHelper.__hgLogLimited">__hgLogLimited</a></td> -<td>Private slot used to perform a hg log --limit.</td> -</tr><tr> <td><a href="#HgProjectHelper.__hgOutgoing">__hgOutgoing</a></td> <td>Private slot used to show the log of changes going out of the repository.</td> </tr><tr> @@ -312,11 +309,6 @@ <b>__hgLogBrowser</b>(<i></i>) <p> Private slot used to browse the log of the current project. -</p><a NAME="HgProjectHelper.__hgLogLimited" ID="HgProjectHelper.__hgLogLimited"></a> -<h4>HgProjectHelper.__hgLogLimited</h4> -<b>__hgLogLimited</b>(<i></i>) -<p> - Private slot used to perform a hg log --limit. </p><a NAME="HgProjectHelper.__hgOutgoing" ID="HgProjectHelper.__hgOutgoing"></a> <h4>HgProjectHelper.__hgOutgoing</h4> <b>__hgOutgoing</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Sep 03 16:41:44 2011 +0200 @@ -158,9 +158,6 @@ <td><a href="#Hg.hgLogBrowser">hgLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Mercurial repository.</td> </tr><tr> -<td><a href="#Hg.hgLogLimited">hgLogLimited</a></td> -<td>Public method used to view the (limited) log of a file/directory from the Mercurial repository.</td> -</tr><tr> <td><a href="#Hg.hgNormalizeURL">hgNormalizeURL</a></td> <td>Public method to normalize a url for Mercurial.</td> </tr><tr> @@ -657,17 +654,6 @@ <dd> file/directory name to show the log of (string) </dd> -</dl><a NAME="Hg.hgLogLimited" ID="Hg.hgLogLimited"></a> -<h4>Hg.hgLogLimited</h4> -<b>hgLogLimited</b>(<i>name</i>) -<p> - Public method used to view the (limited) log of a file/directory from the - Mercurial repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Hg.hgNormalizeURL" ID="Hg.hgNormalizeURL"></a> <h4>Hg.hgNormalizeURL</h4> <b>hgNormalizeURL</b>(<i>url</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html Sat Sep 03 16:41:44 2011 +0200 @@ -94,9 +94,6 @@ <td><a href="#SvnProjectBrowserHelper.__SVNLogBrowser">__SVNLogBrowser</a></td> <td>Private slot called by the context menu to show the log browser for a file.</td> </tr><tr> -<td><a href="#SvnProjectBrowserHelper.__SVNLogLimited">__SVNLogLimited</a></td> -<td>Private slot called by the context menu to show the limited log of a file.</td> -</tr><tr> <td><a href="#SvnProjectBrowserHelper.__SVNMove">__SVNMove</a></td> <td>Private slot called by the context menu to move the selected file.</td> </tr><tr> @@ -239,11 +236,6 @@ <b>__SVNLogBrowser</b>(<i></i>) <p> Private slot called by the context menu to show the log browser for a file. -</p><a NAME="SvnProjectBrowserHelper.__SVNLogLimited" ID="SvnProjectBrowserHelper.__SVNLogLimited"></a> -<h4>SvnProjectBrowserHelper.__SVNLogLimited</h4> -<b>__SVNLogLimited</b>(<i></i>) -<p> - Private slot called by the context menu to show the limited log of a file. </p><a NAME="SvnProjectBrowserHelper.__SVNMove" ID="SvnProjectBrowserHelper.__SVNMove"></a> <h4>SvnProjectBrowserHelper.__SVNMove</h4> <b>__SVNMove</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Sat Sep 03 16:41:44 2011 +0200 @@ -76,9 +76,6 @@ <td><a href="#SvnProjectHelper.__svnLogBrowser">__svnLogBrowser</a></td> <td>Private slot used to browse the log of the current project.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnLogLimited">__svnLogLimited</a></td> -<td>Private slot used to perform a svn log --limit.</td> -</tr><tr> <td><a href="#SvnProjectHelper.__svnPropDel">__svnPropDel</a></td> <td>Private slot used to delete a property for the project files.</td> </tr><tr> @@ -161,11 +158,6 @@ <b>__svnLogBrowser</b>(<i></i>) <p> Private slot used to browse the log of the current project. -</p><a NAME="SvnProjectHelper.__svnLogLimited" ID="SvnProjectHelper.__svnLogLimited"></a> -<h4>SvnProjectHelper.__svnLogLimited</h4> -<b>__svnLogLimited</b>(<i></i>) -<p> - Private slot used to perform a svn log --limit. </p><a NAME="SvnProjectHelper.__svnPropDel" ID="SvnProjectHelper.__svnPropDel"></a> <h4>SvnProjectHelper.__svnPropDel</h4> <b>__svnPropDel</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Sat Sep 03 16:41:44 2011 +0200 @@ -118,9 +118,6 @@ <td><a href="#Subversion.svnLogBrowser">svnLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Subversion repository.</td> </tr><tr> -<td><a href="#Subversion.svnLogLimited">svnLogLimited</a></td> -<td>Public method used to view the (limited) log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.svnNormalizeURL">svnNormalizeURL</a></td> <td>Public method to normalize a url for subversion.</td> </tr><tr> @@ -475,17 +472,6 @@ <dd> file/directory name to show the log of (string) </dd> -</dl><a NAME="Subversion.svnLogLimited" ID="Subversion.svnLogLimited"></a> -<h4>Subversion.svnLogLimited</h4> -<b>svnLogLimited</b>(<i>name</i>) -<p> - Public method used to view the (limited) log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Subversion.svnNormalizeURL" ID="Subversion.svnNormalizeURL"></a> <h4>Subversion.svnNormalizeURL</h4> <b>svnNormalizeURL</b>(<i>url</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html Sat Sep 03 16:41:44 2011 +0200 @@ -91,9 +91,6 @@ <td><a href="#SvnProjectBrowserHelper.__SVNLogBrowser">__SVNLogBrowser</a></td> <td>Private slot called by the context menu to show the log browser for a file.</td> </tr><tr> -<td><a href="#SvnProjectBrowserHelper.__SVNLogLimited">__SVNLogLimited</a></td> -<td>Private slot called by the context menu to show the limited log of a file.</td> -</tr><tr> <td><a href="#SvnProjectBrowserHelper.__SVNMove">__SVNMove</a></td> <td>Private slot called by the context menu to move the selected file.</td> </tr><tr> @@ -230,11 +227,6 @@ <b>__SVNLogBrowser</b>(<i></i>) <p> Private slot called by the context menu to show the log browser for a file. -</p><a NAME="SvnProjectBrowserHelper.__SVNLogLimited" ID="SvnProjectBrowserHelper.__SVNLogLimited"></a> -<h4>SvnProjectBrowserHelper.__SVNLogLimited</h4> -<b>__SVNLogLimited</b>(<i></i>) -<p> - Private slot called by the context menu to show the limited log of a file. </p><a NAME="SvnProjectBrowserHelper.__SVNMove" ID="SvnProjectBrowserHelper.__SVNMove"></a> <h4>SvnProjectBrowserHelper.__SVNMove</h4> <b>__SVNMove</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Sat Sep 03 16:41:44 2011 +0200 @@ -73,9 +73,6 @@ <td><a href="#SvnProjectHelper.__svnLogBrowser">__svnLogBrowser</a></td> <td>Private slot used to browse the log of the current project.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnLogLimited">__svnLogLimited</a></td> -<td>Private slot used to perform a svn log --limit.</td> -</tr><tr> <td><a href="#SvnProjectHelper.__svnPropDel">__svnPropDel</a></td> <td>Private slot used to delete a property for the project files.</td> </tr><tr> @@ -153,11 +150,6 @@ <b>__svnLogBrowser</b>(<i></i>) <p> Private slot used to browse the log of the current project. -</p><a NAME="SvnProjectHelper.__svnLogLimited" ID="SvnProjectHelper.__svnLogLimited"></a> -<h4>SvnProjectHelper.__svnLogLimited</h4> -<b>__svnLogLimited</b>(<i></i>) -<p> - Private slot used to perform a svn log --limit. </p><a NAME="SvnProjectHelper.__svnPropDel" ID="SvnProjectHelper.__svnPropDel"></a> <h4>SvnProjectHelper.__svnPropDel</h4> <b>__svnPropDel</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Fri Sep 02 08:35:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Sat Sep 03 16:41:44 2011 +0200 @@ -112,9 +112,6 @@ <td><a href="#Subversion.svnLogBrowser">svnLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Subversion repository.</td> </tr><tr> -<td><a href="#Subversion.svnLogLimited">svnLogLimited</a></td> -<td>Public method used to view the (limited) log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.svnNormalizeURL">svnNormalizeURL</a></td> <td>Public method to normalize a url for subversion.</td> </tr><tr> @@ -446,17 +443,6 @@ <dd> file/directory name to show the log of (string) </dd> -</dl><a NAME="Subversion.svnLogLimited" ID="Subversion.svnLogLimited"></a> -<h4>Subversion.svnLogLimited</h4> -<b>svnLogLimited</b>(<i>name</i>) -<p> - Public method used to view the (limited) log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Subversion.svnNormalizeURL" ID="Subversion.svnNormalizeURL"></a> <h4>Subversion.svnNormalizeURL</h4> <b>svnNormalizeURL</b>(<i>url</i>)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Sep 03 16:41:44 2011 +0200 @@ -220,9 +220,6 @@ self.trUtf8('Show log'), self._VCSLog) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), self.__HgLogLimited) - self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__HgLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() @@ -407,9 +404,6 @@ self.trUtf8('Show log'), self._VCSLog) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), self.__HgLogLimited) - self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__HgLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -569,17 +563,6 @@ fn = itm.fileName() self.vcs.hgAnnotate(fn) - def __HgLogLimited(self): - """ - Private slot called by the context menu to show the limited log of a file. - """ - itm = self.browser.currentItem() - try: - fn = itm.fileName() - except AttributeError: - fn = itm.dirName() - self.vcs.hgLogLimited(fn) - def __HgLogBrowser(self): """ Private slot called by the context menu to show the log browser for a file.
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Sep 03 16:41:44 2011 +0200 @@ -261,21 +261,6 @@ self.vcsLogAct.triggered[()].connect(self._vcsLog) self.actions.append(self.vcsLogAct) - self.hgLogLimitedAct = E5Action(self.trUtf8('Show limited log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), - 0, 0, self, 'mercurial_log_limited') - self.hgLogLimitedAct.setStatusTip(self.trUtf8( - 'Show a limited log of the local project' - )) - self.hgLogLimitedAct.setWhatsThis(self.trUtf8( - """<b>Show limited log</b>""" - """<p>This shows the log of the local project limited to a selectable""" - """ number of entries.</p>""" - )) - self.hgLogLimitedAct.triggered[()].connect(self.__hgLogLimited) - self.actions.append(self.hgLogLimitedAct) - self.hgLogBrowserAct = E5Action(self.trUtf8('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), @@ -940,7 +925,6 @@ menu.addAction(self.hgBranchListAct) menu.addSeparator() menu.addAction(self.vcsLogAct) - menu.addAction(self.hgLogLimitedAct) menu.addAction(self.hgLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -1005,12 +989,6 @@ """ self.vcs.hgExtendedDiff(self.project.ppath) - def __hgLogLimited(self): - """ - Private slot used to perform a hg log --limit. - """ - self.vcs.hgLogLimited(self.project.ppath) - def __hgLogBrowser(self): """ Private slot used to browse the log of the current project.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Sep 03 16:41:44 2011 +0200 @@ -719,9 +719,15 @@ @param name file/directory name to show the log of (string) """ - self.log = HgLogDialog(self) - self.log.show() - self.log.start(name) + noEntries, ok = QInputDialog.getInteger( + None, + self.trUtf8("Mercurial Log"), + self.trUtf8("Select number of entries to show."), + self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) + if ok: + self.log = HgLogDialog(self) + self.log.show() + self.log.start(name, noEntries) def vcsDiff(self, name): """ @@ -1493,23 +1499,6 @@ self.diff.show() self.diff.start(name, revisions) - def hgLogLimited(self, name): - """ - Public method used to view the (limited) log of a file/directory from the - Mercurial repository. - - @param name file/directory name to show the log of (string) - """ - noEntries, ok = QInputDialog.getInteger( - None, - self.trUtf8("Mercurial Log"), - self.trUtf8("Select number of entries to show."), - self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) - if ok: - self.log = HgLogDialog(self) - self.log.show() - self.log.start(name, noEntries) - def hgLogBrowser(self, path): """ Public method used to browse the log of a file/directory from the
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sat Sep 03 16:41:44 2011 +0200 @@ -244,9 +244,6 @@ self.trUtf8('Show log'), self._VCSLog) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), self.__SVNLogLimited) - self.vcsMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__SVNLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() @@ -511,9 +508,6 @@ self.trUtf8('Show log'), self._VCSLog) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), self.__SVNLogLimited) - self.vcsDirMenuActions.append(act) - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__SVNLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -773,17 +767,6 @@ names.append(itm.dirName()) self.vcs.svnUrlDiff(names) - def __SVNLogLimited(self): - """ - Private slot called by the context menu to show the limited log of a file. - """ - itm = self.browser.currentItem() - try: - fn = itm.fileName() - except AttributeError: - fn = itm.dirName() - self.vcs.svnLogLimited(fn) - def __SVNLogBrowser(self): """ Private slot called by the context menu to show the log browser for a file.
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sat Sep 03 16:41:44 2011 +0200 @@ -128,21 +128,6 @@ self.vcsLogAct.triggered[()].connect(self._vcsLog) self.actions.append(self.vcsLogAct) - self.svnLogLimitedAct = E5Action(self.trUtf8('Show limited log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), - 0, 0, self, 'subversion_log_limited') - self.svnLogLimitedAct.setStatusTip(self.trUtf8( - 'Show a limited log of the local project' - )) - self.svnLogLimitedAct.setWhatsThis(self.trUtf8( - """<b>Show limited log</b>""" - """<p>This shows the log of the local project limited to a selectable""" - """ number of entries.</p>""" - )) - self.svnLogLimitedAct.triggered[()].connect(self.__svnLogLimited) - self.actions.append(self.svnLogLimitedAct) - self.svnLogBrowserAct = E5Action(self.trUtf8('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), @@ -504,7 +489,6 @@ menu.addAction(self.svnListAct) menu.addSeparator() menu.addAction(self.vcsLogAct) - menu.addAction(self.svnLogLimitedAct) menu.addAction(self.svnLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -582,12 +566,6 @@ """ self.vcs.svnUrlDiff(self.project.ppath) - def __svnLogLimited(self): - """ - Private slot used to perform a svn log --limit. - """ - self.vcs.svnLogLimited(self.project.ppath) - def __svnLogBrowser(self): """ Private slot used to browse the log of the current project.
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Sep 03 16:41:44 2011 +0200 @@ -863,10 +863,16 @@ @param name file/directory name to show the log of (string) """ - self.log = SvnLogDialog(self) - self.log.show() - QApplication.processEvents() - self.log.start(name) + noEntries, ok = QInputDialog.getInteger( + None, + self.trUtf8("Subversion Log"), + self.trUtf8("Select number of entries to show."), + self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) + if ok: + self.log = SvnLogDialog(self) + self.log.show() + QApplication.processEvents() + self.log.start(name, noEntries) def vcsDiff(self, name): """ @@ -1730,24 +1736,6 @@ QApplication.processEvents() self.diff.start(name, urls=urls, summary=summary) - def svnLogLimited(self, name): - """ - Public method used to view the (limited) log of a file/directory from the - Subversion repository. - - @param name file/directory name to show the log of (string) - """ - noEntries, ok = QInputDialog.getInteger( - None, - self.trUtf8("Subversion Log"), - self.trUtf8("Select number of entries to show."), - self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) - if ok: - self.log = SvnLogDialog(self) - self.log.show() - QApplication.processEvents() - self.log.start(name, noEntries) - def svnLogBrowser(self, path): """ Public method used to browse the log of a file/directory from the
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat Sep 03 16:41:44 2011 +0200 @@ -241,10 +241,6 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log'), self._VCSLog) self.vcsMenuActions.append(act) - if self.vcs.versionStr >= '1.2.0': - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), self.__SVNLogLimited) - self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__SVNLogBrowser) self.vcsMenuActions.append(act) @@ -508,10 +504,6 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log'), self._VCSLog) self.vcsDirMenuActions.append(act) - if self.vcs.versionStr >= '1.2.0': - act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), self.__SVNLogLimited) - self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), self.__SVNLogBrowser) self.vcsDirMenuActions.append(act) @@ -769,17 +761,6 @@ names.append(itm.dirName()) self.vcs.svnUrlDiff(names) - def __SVNLogLimited(self): - """ - Private slot called by the context menu to show the limited log of a file. - """ - itm = self.browser.currentItem() - try: - fn = itm.fileName() - except AttributeError: - fn = itm.dirName() - self.vcs.svnLogLimited(fn) - def __SVNLogBrowser(self): """ Private slot called by the context menu to show the log browser for a file.
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sat Sep 03 16:41:44 2011 +0200 @@ -128,21 +128,6 @@ self.vcsLogAct.triggered[()].connect(self._vcsLog) self.actions.append(self.vcsLogAct) - self.svnLogLimitedAct = E5Action(self.trUtf8('Show limited log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.trUtf8('Show limited log'), - 0, 0, self, 'subversion_log_limited') - self.svnLogLimitedAct.setStatusTip(self.trUtf8( - 'Show a limited log of the local project' - )) - self.svnLogLimitedAct.setWhatsThis(self.trUtf8( - """<b>Show limited log</b>""" - """<p>This shows the log of the local project limited to a selectable""" - """ number of entries.</p>""" - )) - self.svnLogLimitedAct.triggered[()].connect(self.__svnLogLimited) - self.actions.append(self.svnLogLimitedAct) - self.svnLogBrowserAct = E5Action(self.trUtf8('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), self.trUtf8('Show log browser'), @@ -489,8 +474,6 @@ menu.addAction(self.svnListAct) menu.addSeparator() menu.addAction(self.vcsLogAct) - if self.vcs.versionStr >= '1.2.0': - menu.addAction(self.svnLogLimitedAct) menu.addAction(self.svnLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -567,12 +550,6 @@ """ self.vcs.svnUrlDiff(self.project.ppath) - def __svnLogLimited(self): - """ - Private slot used to perform a svn log --limit. - """ - self.vcs.svnLogLimited(self.project.ppath) - def __svnLogBrowser(self): """ Private slot used to browse the log of the current project.
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Fri Sep 02 08:35:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Sep 03 16:41:44 2011 +0200 @@ -756,9 +756,15 @@ @param name file/directory name to show the log of (string) """ - self.log = SvnLogDialog(self) - self.log.show() - self.log.start(name) + noEntries, ok = QInputDialog.getInteger( + None, + self.trUtf8("Subversion Log"), + self.trUtf8("Select number of entries to show."), + self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) + if ok: + self.log = SvnLogDialog(self) + self.log.show() + self.log.start(name, noEntries) def vcsDiff(self, name): """ @@ -1566,23 +1572,6 @@ QApplication.processEvents() self.diff.start(name, urls=urls, summary=summary) - def svnLogLimited(self, name): - """ - Public method used to view the (limited) log of a file/directory from the - Subversion repository. - - @param name file/directory name to show the log of (string) - """ - noEntries, ok = QInputDialog.getInteger( - None, - self.trUtf8("Subversion Log"), - self.trUtf8("Select number of entries to show."), - self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) - if ok: - self.log = SvnLogDialog(self) - self.log.show() - self.log.start(name, noEntries) - def svnLogBrowser(self, path): """ Public method used to browse the log of a file/directory from the
--- a/changelog Fri Sep 02 08:35:45 2011 +0200 +++ b/changelog Sat Sep 03 16:41:44 2011 +0200 @@ -12,6 +12,11 @@ -- show class attributes, class methods and static methods with different icons - enhancements to the source documentor -- introduced separate sections for class methods and static methods +- enhancements to the version control system interfaces + -- all + --- made "Show Log" behave like "Show Limited Log" and removed the later + -- Mercurial + --- added interface for the Mercurial command server (as of Mercurial 1.9) Version 5.2-snapshot-20110724: - bug fixes
--- a/i18n/eric5_cs.ts Fri Sep 02 08:35:45 2011 +0200 +++ b/i18n/eric5_cs.ts Sat Sep 03 16:41:44 2011 +0200 @@ -15619,42 +15619,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> <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="234"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <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="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <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="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -15664,57 +15664,57 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> <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="558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> <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="622"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> <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="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> <translation>Mercurial log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> @@ -15869,7 +15869,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="465"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15967,12 +15967,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <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> @@ -16345,17 +16345,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="168"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -16445,17 +16445,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="153"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -16576,37 +16576,37 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="117"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> - <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> @@ -16823,12 +16823,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <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> @@ -17135,7 +17135,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="313"/> <source>Revision</source> <translation type="unfinished">Revize</translation> </message> @@ -17210,17 +17210,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="150"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -17258,17 +17258,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1127"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -17393,42 +17393,42 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Deleted</source> - <translation>Smazáno</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <source>Deleted</source> + <translation>Smazáno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -17468,7 +17468,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> @@ -17483,7 +17483,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> @@ -17907,112 +17907,112 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="465"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> <translation>Kopírovat v repozitáři</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move in repository</source> + <translation>Přesunout v repozitáři</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> - <source>Move in repository</source> - <translation>Přesunout v repozitáři</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> - <translation>Zobrazit limitovaný log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> + <translation type="obsolete">Zobrazit limitovaný log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="482"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="485"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="237"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Resolve conflict</source> + <translation>Vyřešit konflikty</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> - <source>Resolve conflict</source> - <translation>Vyřešit konflikty</translation> + <source>Select all local file entries</source> + <translation>Vybrat všechny lokální soubory</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Select all versioned file entries</source> + <translation>Vybrat všechny soubory ve správě verzí</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <source>Select all local directory entries</source> + <translation>Vybrat všechny lokální adresáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local file entries</source> - <translation>Vybrat všechny lokální soubory</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned file entries</source> - <translation>Vybrat všechny soubory ve správě verzí</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Select all local directory entries</source> - <translation>Vybrat všechny lokální adresáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory s překlady z repozitáře?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> @@ -18222,385 +18222,385 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show limited log</source> - <translation>Zobrazit limitovaný log</translation> + <translation type="obsolete">Zobrazit limitovaný log</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a limited log of the local project</source> - <translation>Zobrazit limitovaný log lokálního projektu</translation> + <translation type="obsolete">Zobrazit limitovaný log lokálního projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation><b>Zobrazit limitovaný log</b><p>Zobrazuje log lokálního projektu jen do určitého počtu záznamů.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> + <translation type="obsolete"><b>Zobrazit limitovaný log</b><p>Zobrazuje log lokálního projektu jen do určitého počtu záznamů.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show &status</source> <translation>Zobrazit &status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> <source>Show the heads of the repository</source> <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source>Show the parents of the repository</source> <translation>Zobrazit předky repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> <source>Show the tip of the repository</source> <translation>Zobrazí ukazatel tip repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source>Merge changes of a revision into the local project</source> <translation>Sloučí změny revize do lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> <translation>Vyřešit konflikty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> <translation>Vyřešit kon&flikty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> <translation>Vyřešit všechny konflikty v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Create a new branch for the local project in the repository</source> <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Switch the working directory to another revision</source> <translation>Přepnout pracovní adresář do jiné revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>Cleanu&p</source> <translation>Vy&prat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Command options</source> <translation>Parametry příkazu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Command &options...</source> <translation>&Parametry příkazu...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation>Zobrazit parametry Mercurial příkazu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů Mercurial příkazu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> @@ -18645,292 +18645,292 @@ <translation type="obsolete"><b>Zobrazit kombinovaná nastavení konfigurace</b><p>Toto zobrazí kombinovaná nastavení ze všech konfigurací.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation>Ověřit integritu repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation>Zotavit z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> <source>Show the current branch of the project</source> <translation>Zobrazit aktuální větev projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="744"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation>Přeskočit aktuální množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation>Identifikovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation>Identifikovat skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identifikuje soubor se skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Identifikovat skupinu změn</b><p>Identifikuje soubor se skupinou změn obsahující množinu změn.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> @@ -18950,132 +18950,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> @@ -19156,37 +19156,37 @@ <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="114"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="114"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="236"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="236"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="302"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="302"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="296"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -19260,17 +19260,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="105"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="105"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="192"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -19288,12 +19288,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -19378,17 +19378,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="190"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="190"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="222"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -19408,7 +19408,7 @@ <translation type="unfinished">chybějící</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="295"/> <source>unknown</source> <translation type="unfinished">neznámý</translation> </message> @@ -19451,7 +19451,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -20369,12 +20369,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="155"/> <source>Mercurial status checked successfully</source> <translation>Mercurial status úspěšně zkontrolován</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="102"/> <source>Could not start the Mercurial process.</source> <translation>Nelze spustit Mercurial proces.</translation> </message> @@ -20464,32 +20464,32 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="89"/> <source>Mercurial Branches List</source> <translation>Mercurial sezam větví</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="90"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="134"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="134"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="250"/> <source>active</source> <translation>aktivní</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="255"/> <source>yes</source> <translation>ano</translation> </message> @@ -35585,107 +35585,107 @@ <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> <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="948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> <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="1012"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> <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="1063"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> <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="1343"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> <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="1607"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> <source>Subversion Log</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> <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="1791"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> <source>Relocating</source> <translation></translation> </message> @@ -35850,27 +35850,27 @@ <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -35900,27 +35900,27 @@ <translation>Přesun {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="983"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> <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="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -35936,7 +35936,7 @@ <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -36739,12 +36739,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="549"/> <source>Author</source> <translation>Autor</translation> </message> @@ -37372,172 +37372,172 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="576"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="587"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="596"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="590"/> <source>Commit changes to repository...</source> <translation>Commitovat změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="350"/> <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="604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> <translation>Kopírovat v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> <translation>Přesunout v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="513"/> <source>Show limited log</source> - <translation>Zobrazit limitovaný log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="617"/> + <translation type="obsolete">Zobrazit limitovaný log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="621"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="624"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="268"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="627"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <source>Merge changes</source> + <translation>Sloučit změny</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> - <source>Merge changes</source> - <translation>Sloučit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="639"/> <source>Resolve conflict</source> <translation>Vyřešit konflikty</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> + <source>Lock</source> + <translation>Zamknout</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="391"/> - <source>Lock</source> - <translation>Zamknout</translation> + <source>Unlock</source> + <translation>Odemknout</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="394"/> - <source>Unlock</source> - <translation>Odemknout</translation> + <source>Break Lock</source> + <translation>Prolomit zámek</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="397"/> - <source>Break Lock</source> - <translation>Prolomit zámek</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="400"/> <source>Steal Lock</source> <translation>Scizit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="642"/> + <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="644"/> + <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="646"/> + <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> + </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> + </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 local file entries</source> - <translation>Vybrat všechny lokální soubory</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> - <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="653"/> - <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="655"/> <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="523"/> + <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="628"/> + <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="516"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="610"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> <source>Add to Changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="607"/> <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> @@ -37667,475 +37667,475 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> <source>Show limited log</source> - <translation>Zobrazit limitovaný log</translation> + <translation type="obsolete">Zobrazit limitovaný log</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> <source>Show a limited log of the local project</source> - <translation>Zobrazit limitovaný log lokálního projektu</translation> + <translation type="obsolete">Zobrazit limitovaný log lokálního projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation><b>Zobrazit limitovaný log</b><p>Zobrazuje log lokálního projektu jen do určitého počtu záznamů.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> + <translation type="obsolete"><b>Zobrazit limitovaný log</b><p>Zobrazuje log lokálního projektu jen do určitého počtu záznamů.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="205"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="205"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> <source>Show &status</source> <translation>Zobrazit &status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="209"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> <source>Export a project from the repository</source> <translation>Export projekt z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source>Command options</source> + <translation>Parametry příkazu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source>Command &options...</source> + <translation>&Parametry příkazu...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> + <source>Show the VCS command options</source> + <translation>Zobrazit parametry VCS příkazu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <source>Re&vert changes</source> + <translation>&Vrátit změny</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source>Command options</source> - <translation>Parametry příkazu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source>Command &options...</source> - <translation>&Parametry příkazu...</translation> + <source>Revert all changes made to the local project</source> + <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> - <source>Show the VCS command options</source> - <translation>Zobrazit parametry VCS příkazu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> - <source>Re&vert changes</source> - <translation>&Vrátit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source>Revert all changes made to the local project</source> - <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Sloučit změny tagu/revize do lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny tagu/revize do lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> <source>Switch the local copy to another tag/branch</source> <translation>Přepnout lokální kopii do jiného tagu/větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Přepnout</b><p>Přepne lokální kopii do jiného tagu/větve.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> <translation>Vyřešit konflikty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> <translation>Vyřešit kon&flikty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> <translation>Vyřešit všechny konflikty v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Cleanu&p</source> <translation>V&yčistit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute an arbitrary VCS command</source> <translation>Provede se libovolný VCS příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného příkazu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>List repository contents</source> <translation>Seznam obsahu repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>List repository contents...</source> <translation>Seznam obsahu repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> <source>Lists the contents of the repository</source> <translation>Vypisuje seznam obsahu repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Seznam obsahu repozitáře</b><p>Zobrazuje seznam obsahu repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>Set Property</source> <translation>Nastavit vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>Set Property...</source> <translation>Nastavit vlastnosti...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> <source>Set a property for the project files</source> <translation>Nastaví vlastnosti souborů projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Nastavit vlastnosti</b><p>Nastavuje vlastnosti souborů projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>List Properties</source> <translation>Seznam vlastností</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>List Properties...</source> <translation>Seznam vlastností...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> <source>List properties of the project files</source> <translation>Seznam vlastností souborů projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Seznam vlastností</b><p>Vypisuje seznam vlastností souborů projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Delete Property</source> <translation>Smazat vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Delete Property...</source> <translation>Smazat vlastnost...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> <source>Delete a property for the project files</source> <translation>Smaže vlastnost pro soubory projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> <source>Show repository info</source> <translation>Zobrazit info repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> <source>Show some repository related information for the local project</source> <translation>Zobrazí nějaké infomace související s repozitářem pro lokální projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Zobrazit info repozitáře</b><p>Zobrazí nějaké infomace související s repozitářem pro lokální projekt.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate</source> <translation>Přemístit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation>Přemístit...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="436"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> <source>Relocate the working copy to a new repository URL</source> <translation>Přemístit pracovní kopii do nového URL repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="439"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Přemístit</b><p>Pracovní kopie se přemístí na nové URL repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> <source>Show difference (URLs)</source> <translation>Zobrazit odlišnosti (na URL)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> <source>Show the difference of the project between two repository URLs</source> <translation>Zobrazit odlišnosti v projektu mezi dvěma repozitáři na URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Zobrazit odlišnosti (na URL)</b><p>Zobrazují se odlišnosti v projektu mezi dvěma repozitáři na URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> <source>Repository Browser...</source> <translation>Prohlížeč repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> <source>Show the Repository Browser dialog</source> <translation>Zobrazit dialog prohlížeče repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> </message> @@ -49440,7 +49440,7 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> <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> @@ -49456,14 +49456,14 @@ <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1201"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49742,17 +49742,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> <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="1385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <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 Fri Sep 02 08:35:45 2011 +0200 +++ b/i18n/eric5_de.ts Sat Sep 03 16:41:44 2011 +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> @@ -1641,8 +1640,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1860,7 +1859,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="76"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -12574,7 +12573,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="802"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -15271,97 +15270,97 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> <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="234"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <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="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <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="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> <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="506"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> <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="558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> <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="622"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> <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="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> @@ -15511,7 +15510,7 @@ <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="465"/> <source>Committing changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> @@ -15609,12 +15608,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <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> @@ -15988,17 +15987,17 @@ <translation>Ausgehende Mercurial Lesezeichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="168"/> <source>no bookmarks found</source> <translation>keine Lesezeichen vorhanden</translation> </message> @@ -16090,17 +16089,17 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="153"/> <source>no bookmarks defined</source> <translation>keine Lesezeichen vorhanden</translation> </message> @@ -16221,37 +16220,37 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="117"/> - <source>Did not receive the 'hello' message.</source> - <translation>'Hallo' Nachricht konnte nicht empfangen werden.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> - <source>Received data on unexpected channel.</source> - <translation>Daten auf unerwartetem Kanal empfangen.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> - <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> - <translation>Ungültige 'Hallo' Nachricht; Erwartete 'capabilities: ', empfing jedoch '{0}'.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>Did not receive the 'hello' message.</source> + <translation>'Hallo' Nachricht konnte nicht empfangen werden.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <source>Received data on unexpected channel.</source> + <translation>Daten auf unerwartetem Kanal empfangen.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation>Ungültige 'Hallo' Nachricht; Erwartete 'capabilities: ', empfing jedoch '{0}'.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> <source>'capabilities' message did not contain any capability.</source> <translation>'capabilities' Nachricht enthielt keine Fähigkeiten.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Ungültige 'Hallo' Nachricht; Erwartete 'encoding: ', empfing jedoch '{0}'.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> <source>'encoding' message did not contain any encoding.</source> <translation>'encoding' Nachricht enthielt keine Kodierung.</translation> </message> @@ -16474,12 +16473,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <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> @@ -16781,7 +16780,7 @@ <translation>Wähle die als Filter zu verwendende Kategorie</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="313"/> <source>Revision</source> <translation>Revision</translation> </message> @@ -16856,17 +16855,17 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="150"/> <source>no signatures found</source> <translation>keine Signaturen gefunden</translation> </message> @@ -16904,17 +16903,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1127"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -17029,42 +17028,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Deleted</source> - <translation>Gelöscht</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <source>Deleted</source> + <translation>Gelöscht</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> @@ -17114,7 +17113,7 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>All</source> <translation>Alle</translation> </message> @@ -17129,7 +17128,7 @@ <translation>Mercurial Log (Ausgang)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> @@ -17562,112 +17561,107 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="465"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> <translation>Im Repository kopieren</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move in repository</source> + <translation>Im Repository verschieben</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> - <source>Move in repository</source> - <translation>Im Repository verschieben</translation> + <source>Show log</source> + <translation>Beschreibungen anzeigen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> - <source>Show limited log</source> - <translation>Beschreibungen limitiert anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="482"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="485"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="237"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Resolve conflict</source> + <translation>Konflikt lösen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> - <source>Resolve conflict</source> - <translation>Konflikt lösen</translation> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Select all versioned file entries</source> + <translation>Alle versionierten Dateieinträge auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <source>Select all local directory entries</source> + <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned file entries</source> - <translation>Alle versionierten Dateieinträge auswählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Select all local directory entries</source> - <translation>Alle lokalen Verzeichniseinträge auswählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Remove from repository only</source> <translation>Nur vom Repository löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Wollen Sie wirklich diese Übersetzungsdateien vom Repository löschen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Do you really want to remove these files from the repository?</source> <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> </message> @@ -17876,676 +17870,661 @@ </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> - <source>Show limited log</source> - <translation>Beschreibungen limitiert anzeigen</translation> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show a limited log of the local project</source> - <translation>Zeigt eine begrenzte Anzahl an Beschreibungen für das aktuelle Projekt</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation><b>Beschreibungen limitiert anzeigen</b><p>Dies zeigt die Beschreibungen des lokalen Projektes limitiert auf eine auswählbare Anzahl von Einträgen.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show &status</source> <translation>Status an&zeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> <source>Show heads</source> <translation>Köpfe anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> <source>Show the heads of the repository</source> <translation>Zeigt die Köpfe des Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show parents</source> <translation>Vorgänger anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source>Show the parents of the repository</source> <translation>Zeigt die Vorgänger des repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Show tip</source> <translation>Spitze (tip) anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> <source>Show the tip of the repository</source> <translation>Zeigt die Spitze (tip) des Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation>Änderungen &rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source>Revert all changes made to the local project</source> <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Merge</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Mer&ge changes...</source> <translation>Änderungen ein&pflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source>Merge changes of a revision into the local project</source> <translation>Pflege Änderungen einer Revision in das lokale Projekt ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Änderungen einpflegen</b><p>Dies pfleget Änderungen einer Revision in das lokale Projekt ein.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> <translation>Konflikte lösen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> <translation>&Konflikte lösen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> <translation>Löse alle Konflikte des lokalen Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Konflikte lösen</b><p>Dies löst alle Konflikte des lokalen Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Tag the local project in the repository</source> <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation>&Zweig erzeugen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Create a new branch for the local project in the repository</source> <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Close the current branch of the local project</source> <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Switch the working directory to another revision</source> <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>Execute an arbitrary Mercurial command</source> <translation>Führe einen beliebigen Mercurial Befehl aus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Command options</source> <translation>Befehlsoptionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Command &options...</source> <translation>Befehls&optionen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation>Zeigt die Mercurial Befehlsoptionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der Mercurial Befehlsoptionen.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial Seite</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial Seite.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation>Zeigt die Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositories.</p<</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation>Repository verifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation>Verfiziert die Integrität des Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation>Setzt eine abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation>Erstelle eine .hgignore Datei mit Standardwerten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore Datei mit Standardwerten.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit 'Änderungsgruppe erzeugen' erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> <source>Show the current branch of the project</source> <translation>Zeigt den aktuellen Zweig des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation>Als "gut" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="744"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation>Als "schlecht" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation>Überspringe den aktuellen Änderungssatz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation>Setzt die Bisect Suchdaten zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation>Als "gut" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Als "schlecht" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation>Änderungsgruppe identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation>Änderungsgruppe identifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies identifiziert eine Änderungsgruppendatei für Änderungssätze.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> @@ -18565,132 +18544,132 @@ <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option 'force' hoch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Show an editor to edit the user configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Edit repository configuration...</source> <translation>Repositorykonfiguration editieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show an editor to edit the repository configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings</source> <translation>Zeige kombinierte Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation>Zeige kombinierte Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> @@ -18771,37 +18750,37 @@ <translation>Entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="114"/> <source>Unsaved Changes</source> <translation>Nicht gesicherte Änderungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="114"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation>Die Liste der Guards wurde verändert. Sollen die Änderungen angewendet werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="236"/> <source>Remove Guards</source> <translation>Guards löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="236"/> <source>Do you really want to remove the selected guards?</source> <translation>Sollen die ausgewählten Guards wirklich gelöscht werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="302"/> <source>Apply Guard Definitions</source> <translation>Guard Definitionen anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="302"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation><p>Die definierten Guards konnten nicht angelegt werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="296"/> <source>The Mercurial process did not finish in time.</source> <translation>Der Mercurial Prozess endete nicht zeitgerecht.</translation> </message> @@ -18875,17 +18854,17 @@ <translation>Änderungsbeschreibung</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="105"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="105"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="192"/> <source>Error: </source> <translation>Fehler:</translation> </message> @@ -18903,12 +18882,12 @@ <translation>Zeigt alle Guards aller Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> <source>Unguarded</source> <translation>Ungesichert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> <source>no patches found</source> <translation>keine Patches gefunden</translation> </message> @@ -18995,17 +18974,17 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="190"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="190"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="222"/> <source>no patches found</source> <translation>keine Patches gefunden</translation> </message> @@ -19030,7 +19009,7 @@ <translation>fehlt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="295"/> <source>unknown</source> <translation>unbekannt</translation> </message> @@ -19068,7 +19047,7 @@ <translation>Dies zeigt die Liste aller für den ausgewählten Patch zu definierenden Guards an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> <source>Unguarded</source> <translation>Ungesichert</translation> </message> @@ -19977,12 +19956,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="155"/> <source>Mercurial status checked successfully</source> <translation>Mercurial Status erfolgreich überprüft</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="102"/> <source>Could not start the Mercurial process.</source> <translation>Der Mercurial Prozess konnte nicht gestartet werden.</translation> </message> @@ -20074,32 +20053,32 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="89"/> <source>Mercurial Branches List</source> <translation>Mercurial Zweigliste</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="90"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="134"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="134"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="250"/> <source>active</source> <translation>aktiv</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="255"/> <source>yes</source> <translation>ja</translation> </message> @@ -34925,57 +34904,57 @@ <translation>Expotiere das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> <source>Subversion Error</source> <translation>Subversion Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> <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 Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="983"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> <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="1039"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> <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 Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> <source>Switching to {0}</source> <translation>Schalte {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> <source>Merging {0}</source> <translation>Arbeite Änderungen in {0} ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> <source>Cleaning up {0}</source> <translation>Räume {0} auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> <source>Subversion command</source> <translation>Subversion Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> @@ -34995,22 +34974,22 @@ <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> <source>Subversion Set Property</source> <translation>Subversion Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> <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="1607"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Subversion Delete Property</source> <translation>Subversion Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> <source>Enter property name</source> <translation>Gib den Namen der Eigenschaft ein</translation> </message> @@ -35040,12 +35019,12 @@ <translation>Lösche Dateien/Verzeichnisse aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> <source>Resolving conficts</source> <translation>Löse Konflikte</translation> </message> @@ -35070,22 +35049,22 @@ <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="1740"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> <source>Subversion Log</source> <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> <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="1791"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> <source>Locking in the Subversion repository</source> <translation>Sperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> <source>Unlocking in the Subversion repository</source> <translation>Entsperren im Subversion Repository</translation> </message> @@ -35095,34 +35074,34 @@ <translation>Revision {0} eingepflegt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Revision {0}. </source> <translation>Revision {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> <source>Property set.</source> <translation>Eigenschaft definiert.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> <source>Property deleted.</source> <translation>Eigenschaft gelöscht.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> <source>Subversion Lock</source> <translation>Subversion Sperre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> <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="1874"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> <source>Relocating</source> <translation>Relozierung</translation> </message> @@ -35299,27 +35278,27 @@ <translation>Das svn Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> <source>Repository Browser</source> <translation>Repository Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> <source>Enter the repository URL.</source> <translation>Gib die URL des Repository ein.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> <source>Remove from changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> <source>Add to changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> <source>Enter name of the changelist:</source> <translation>Gib deb Namen der Änderungsliste ein:</translation> </message> @@ -36138,12 +36117,12 @@ <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="549"/> <source>Author</source> <translation>Autor</translation> </message> @@ -36782,172 +36761,167 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="587"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="596"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="590"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="350"/> <source>Add tree to repository</source> <translation>Verzeichnisbaum zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> <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="497"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> <translation>Im Repository kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> <translation>Im Repository verschieben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="617"/> + <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="621"/> + <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="624"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="627"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <source>Merge changes</source> + <translation>Änderungen einarbeiten</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> + <source>Resolve conflict</source> + <translation>Konflikt lösen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> - <source>Merge changes</source> - <translation>Änderungen einarbeiten</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="639"/> - <source>Resolve conflict</source> - <translation>Konflikt lösen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="642"/> <source>Set Property</source> <translation>Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <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="646"/> + <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> + </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> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> + <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"/> - <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="651"/> - <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="653"/> - <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="655"/> <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="513"/> - <source>Show limited log</source> - <translation>Beschreibungen limitiert anzeigen</translation> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> + <source>Lock</source> + <translation>Sperren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="391"/> - <source>Lock</source> - <translation>Sperren</translation> + <source>Unlock</source> + <translation>Entsperren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="394"/> - <source>Unlock</source> - <translation>Entsperren</translation> + <source>Break Lock</source> + <translation>Sperre brechen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="397"/> - <source>Break Lock</source> - <translation>Sperre brechen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="400"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="576"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="268"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show repository info</source> <translation>Zeige Repository Informationen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="628"/> + <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="516"/> + <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="658"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="610"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> <source>Add to Changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="607"/> <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> @@ -37075,477 +37049,462 @@ <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="205"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="205"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> <source>Show &status</source> <translation>Status an&zeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="209"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> <source>Tag the local project in the repository</source> <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> <source>Export a project from the repository</source> <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source>Command options</source> + <translation>Befehlsoptionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source>Command &options...</source> + <translation>Befehls&optionen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> + <source>Show the VCS command options</source> + <translation>Zeigt die VCS Befehlsoptionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS Befehlsoptionen.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <source>Re&vert changes</source> + <translation>Änderungen &rückgängig</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source>Command options</source> - <translation>Befehlsoptionen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source>Command &options...</source> - <translation>Befehls&optionen...</translation> + <source>Revert all changes made to the local project</source> + <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> - <source>Show the VCS command options</source> - <translation>Zeigt die VCS Befehlsoptionen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS Befehlsoptionen.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> - <source>Re&vert changes</source> - <translation>Änderungen &rückgängig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source>Revert all changes made to the local project</source> - <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> <source>Merge</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> <source>Mer&ge changes...</source> <translation>Änderungen ein&pflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Pflege Änderungen eines Tags/Zweiges in das lokale Projekt ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Änderungen einpflegen</b><p>Dies pfleget Änderungen eines Tags/Zweiges in das lokale Projekt ein.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> <source>Switch the local copy to another tag/branch</source> <translation>Schalte die lokale Kopie auf ein anderes Tag/anderen Zweig um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Umschalten</b><p>Dies schaltet die lokale Kopie auf ein anderes Tag/anderen Zweig um.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> <translation>Konflikte lösen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> <translation>&Konflikte lösen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> <translation>Löse alle Konflikte des lokalen Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Konflikte lösen</b><p>Dies löst alle Konflikte des lokalen Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute an arbitrary VCS command</source> <translation>Führe einen beliebigen VCS Befehl aus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>List repository contents</source> <translation>Repository Inhalt listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>List repository contents...</source> <translation>Repository Inhalt listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> <source>Lists the contents of the repository</source> <translation>Listet den Inhalt des Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Repository Inhalt listen</b><p>Dies listet den Inhalt des Repositories.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>Set Property</source> <translation>Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>Set Property...</source> <translation>Eigenschaft definieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> <source>Set a property for the project files</source> <translation>Definiert eine Eigenschaft für alle Projektdateien</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>List Properties</source> <translation>Eigenschaften listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>List Properties...</source> <translation>Eigenschaften listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> <source>List properties of the project files</source> <translation>Listet Eigenschaften der Projektdateien</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Delete Property</source> <translation>Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Delete Property...</source> <translation>Eigenschaft löschen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> <source>Delete a property for the project files</source> <translation>Eine Eigenschaft für alle Projektdateien löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> + <source>Show repository info</source> + <translation>Zeige Repository Informationen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> + <source>Show some repository related information for the local project</source> + <translation>Zeige Repository bezogene Informationen des lokalen Projektes an</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Relocate</source> + <translation>Relozieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Relocate...</source> + <translation>Relozieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <source>Relocate the working copy to a new repository URL</source> + <translation>Reloziere die Arbeitskopie zu einer neuen Repository URL</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> + <translation><b>Relozieren</b><p>Dies reloziert die Arbeitskopie zu einer neuen Repository URL.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> + <translation><b>Zeige Repository Informationen</b><p>Dies zeigt Repository bezogene Informationen des lokalen Projektes an.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <source>Show difference (URLs)</source> + <translation>Unterschiede anzeigen (URLs)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <source>Show the difference of the project between two repository URLs</source> + <translation>Zeigt den Unterschied des Projektes zwischen zwei Repository URLs</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> + <translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt den Unterschied des Projektes zwischen zwei Repository URLs.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <source>Repository Browser</source> + <translation>Repository Browser</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <source>Repository Browser...</source> + <translation>Repository Browser...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <source>Show the Repository Browser dialog</source> + <translation>Zeigt den Repository Browser Dialog</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Repository Browser...</b><p>Dies zeigt den Repository Browser Dialog.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> - <source>Show limited log</source> - <translation>Beschreibungen limitiert anzeigen</translation> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> - <source>Show a limited log of the local project</source> - <translation>Zeigt eine begrenzte Anzahl an Beschreibungen für das aktuelle Projekt</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation><b>Beschreibungen limitiert anzeigen</b><p>Dies zeigt die Beschreibungen des lokalen Projektes limitiert auf eine auswählbare Anzahl von Einträgen.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> - <source>Show repository info</source> - <translation>Zeige Repository Informationen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> - <source>Show some repository related information for the local project</source> - <translation>Zeige Repository bezogene Informationen des lokalen Projektes an</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Relocate</source> - <translation>Relozieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Relocate...</source> - <translation>Relozieren...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="436"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>Reloziere die Arbeitskopie zu einer neuen Repository URL</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="439"/> - <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> - <translation><b>Relozieren</b><p>Dies reloziert die Arbeitskopie zu einer neuen Repository URL.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> - <translation><b>Zeige Repository Informationen</b><p>Dies zeigt Repository bezogene Informationen des lokalen Projektes an.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> - <source>Show difference (URLs)</source> - <translation>Unterschiede anzeigen (URLs)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show the difference of the project between two repository URLs</source> - <translation>Zeigt den Unterschied des Projektes zwischen zwei Repository URLs</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> - <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt den Unterschied des Projektes zwischen zwei Repository URLs.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="446"/> - <source>Repository Browser</source> - <translation>Repository Browser</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="446"/> - <source>Repository Browser...</source> - <translation>Repository Browser...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> - <source>Show the Repository Browser dialog</source> - <translation>Zeigt den Repository Browser Dialog</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Repository Browser...</b><p>Dies zeigt den Repository Browser Dialog.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="146"/> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="150"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite.</p></translation> </message> @@ -48671,7 +48630,7 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> <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> @@ -48688,7 +48647,7 @@ <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1201"/> <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> @@ -48697,7 +48656,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48986,17 +48945,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> <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>Repository Informationen</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="1384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> <source>unknown</source> <translation>Unbekannt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <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>Repository Informationen</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 Fri Sep 02 08:35:45 2011 +0200 +++ b/i18n/eric5_en.ts Sat Sep 03 16:41:44 2011 +0200 @@ -15186,97 +15186,97 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> <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="234"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> <translation type="unfinished"></translation> </message> @@ -15426,7 +15426,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="465"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15524,12 +15524,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -15902,17 +15902,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="168"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -16002,17 +16002,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="153"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -16133,37 +16133,37 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="117"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> - <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> @@ -16378,12 +16378,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -16685,7 +16685,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="313"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -16760,17 +16760,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="150"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -16818,17 +16818,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1127"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -16978,47 +16978,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Deleted</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -17033,7 +17033,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> @@ -17450,112 +17450,107 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="465"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move in repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> - <source>Move in repository</source> + <source>Show log</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> - <source>Show limited log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="482"/> <source>Show difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="485"/> <source>Show difference (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="237"/> <source>Show annotated file</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Resolve conflict</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> - <source>Resolve conflict</source> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <source>Select all local directory entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Select all local directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Do you really want to remove these translation files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> @@ -17779,806 +17774,791 @@ </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> - <source>Show limited log</source> + <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show a limited log of the local project</source> + <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <source>Show difference (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show &status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <source>Create a new branch for the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>Cleanu&p</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <source>Cleanup the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> + <source>Command options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> + <source>Command &options...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <source>Show the Mercurial command options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <source>Verify the integrity of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <source>Recover</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <source>Recover...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <source>Recover from an interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Preview a changegroup file containing a collection of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Identify changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Identify changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <source>Identify a changegroup file containing a collection of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished"></translation>