Mercurial Repositories > eric / changeset
changeset
Added a handler for ftp: URLs to the web browser.
Mon, 24 May 2010 18:38:54 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 24 May 2010 18:38:54 +0200
- changeset 278
- c93823b96faa
- parent 276
- 4a7e25ee406c
- child 280
- e477e5660014
Added a handler for ftp: URLs to the web browser.
--- a/APIs/Python3/eric5.api Sun May 23 15:09:37 2010 +0200 +++ b/APIs/Python3/eric5.api Mon May 24 18:38:54 2010 +0200 @@ -2103,6 +2103,13 @@ eric5.Helpviewer.JavaScriptResources.fetchLinks_js?7 eric5.Helpviewer.JavaScriptResources.parseForms_js?7 eric5.Helpviewer.Network.AboutAccessHandler.AboutAccessHandler.createRequest?4(op, request, outgoingData = None) +eric5.Helpviewer.Network.FtpAccessHandler.FtpAccessHandler.createRequest?4(op, request, outgoingData = None) +eric5.Helpviewer.Network.FtpReply.FtpReply.abort?4() +eric5.Helpviewer.Network.FtpReply.FtpReply.bytesAvailable?4() +eric5.Helpviewer.Network.FtpReply.FtpReply.isSequential?4() +eric5.Helpviewer.Network.FtpReply.FtpReply.readData?4(maxlen) +eric5.Helpviewer.Network.FtpReply.FtpReply?1(url, parent = None) +eric5.Helpviewer.Network.FtpReply.ftpListPage_html?7 eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.createRequest?4(op, request, outgoingData = None) eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.languagesChanged?4() eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.preferencesChanged?4() @@ -2969,7 +2976,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force = False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolve?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowBranch?4(name)
--- a/Documentation/Help/source.qhp Sun May 23 15:09:37 2010 +0200 +++ b/Documentation/Help/source.qhp Mon May 24 18:38:54 2010 +0200 @@ -229,6 +229,8 @@ </section> <section title="eric5.Helpviewer.Network" ref="index-eric5.Helpviewer.Network.html"> <section title="eric5.Helpviewer.Network.AboutAccessHandler" ref="eric5.Helpviewer.Network.AboutAccessHandler.html" /> + <section title="eric5.Helpviewer.Network.FtpAccessHandler" ref="eric5.Helpviewer.Network.FtpAccessHandler.html" /> + <section title="eric5.Helpviewer.Network.FtpReply" ref="eric5.Helpviewer.Network.FtpReply.html" /> <section title="eric5.Helpviewer.Network.NetworkAccessManager" ref="eric5.Helpviewer.Network.NetworkAccessManager.html" /> <section title="eric5.Helpviewer.Network.NetworkAccessManagerProxy" ref="eric5.Helpviewer.Network.NetworkAccessManagerProxy.html" /> <section title="eric5.Helpviewer.Network.NetworkDiskCache" ref="eric5.Helpviewer.Network.NetworkDiskCache.html" /> @@ -6929,10 +6931,28 @@ <keyword name="NetworkAccessManager.languagesChanged" id="NetworkAccessManager.languagesChanged" ref="eric5.Helpviewer.Network.NetworkAccessManager.html#NetworkAccessManager.languagesChanged" /> <keyword name="NetworkAccessManager.preferencesChanged" id="NetworkAccessManager.preferencesChanged" ref="eric5.Helpviewer.Network.NetworkAccessManager.html#NetworkAccessManager.preferencesChanged" /> <keyword name="NetworkAccessManager.setSchemeHandler" id="NetworkAccessManager.setSchemeHandler" ref="eric5.Helpviewer.Network.NetworkAccessManager.html#NetworkAccessManager.setSchemeHandler" /> + <keyword name="FtpAccessHandler (Module)" id="FtpAccessHandler (Module)" ref="eric5.Helpviewer.Network.FtpAccessHandler.html" /> + <keyword name="FtpAccessHandler" id="FtpAccessHandler" ref="eric5.Helpviewer.Network.FtpAccessHandler.html#FtpAccessHandler" /> + <keyword name="FtpAccessHandler.createRequest" id="FtpAccessHandler.createRequest" ref="eric5.Helpviewer.Network.FtpAccessHandler.html#FtpAccessHandler.createRequest" /> <keyword name="QtHelpAccessHandler (Module)" id="QtHelpAccessHandler (Module)" ref="eric5.Helpviewer.Network.QtHelpAccessHandler.html" /> <keyword name="QtHelpAccessHandler" id="QtHelpAccessHandler" ref="eric5.Helpviewer.Network.QtHelpAccessHandler.html#QtHelpAccessHandler" /> <keyword name="QtHelpAccessHandler (Constructor)" id="QtHelpAccessHandler (Constructor)" ref="eric5.Helpviewer.Network.QtHelpAccessHandler.html#QtHelpAccessHandler.__init__" /> <keyword name="QtHelpAccessHandler.createRequest" id="QtHelpAccessHandler.createRequest" ref="eric5.Helpviewer.Network.QtHelpAccessHandler.html#QtHelpAccessHandler.createRequest" /> + <keyword name="FtpReply (Module)" id="FtpReply (Module)" ref="eric5.Helpviewer.Network.FtpReply.html" /> + <keyword name="FtpReply" id="FtpReply" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply" /> + <keyword name="FtpReply (Constructor)" id="FtpReply (Constructor)" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__init__" /> + <keyword name="FtpReply.__commandStarted" id="FtpReply.__commandStarted" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__commandStarted" /> + <keyword name="FtpReply.__connectToHost" id="FtpReply.__connectToHost" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__connectToHost" /> + <keyword name="FtpReply.__cssLinkClass" id="FtpReply.__cssLinkClass" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__cssLinkClass" /> + <keyword name="FtpReply.__processCommand" id="FtpReply.__processCommand" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__processCommand" /> + <keyword name="FtpReply.__processData" id="FtpReply.__processData" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__processData" /> + <keyword name="FtpReply.__processListInfo" id="FtpReply.__processListInfo" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__processListInfo" /> + <keyword name="FtpReply.__setContent" id="FtpReply.__setContent" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__setContent" /> + <keyword name="FtpReply.__setListContent" id="FtpReply.__setListContent" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.__setListContent" /> + <keyword name="FtpReply.abort" id="FtpReply.abort" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.abort" /> + <keyword name="FtpReply.bytesAvailable" id="FtpReply.bytesAvailable" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.bytesAvailable" /> + <keyword name="FtpReply.isSequential" id="FtpReply.isSequential" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.isSequential" /> + <keyword name="FtpReply.readData" id="FtpReply.readData" ref="eric5.Helpviewer.Network.FtpReply.html#FtpReply.readData" /> <keyword name="AboutAccessHandler (Module)" id="AboutAccessHandler (Module)" ref="eric5.Helpviewer.Network.AboutAccessHandler.html" /> <keyword name="AboutAccessHandler" id="AboutAccessHandler" ref="eric5.Helpviewer.Network.AboutAccessHandler.html#AboutAccessHandler" /> <keyword name="AboutAccessHandler.createRequest" id="AboutAccessHandler.createRequest" ref="eric5.Helpviewer.Network.AboutAccessHandler.html#AboutAccessHandler.createRequest" /> @@ -7918,6 +7938,7 @@ <keyword name="HgProjectHelper.__hgPreviewBundle" id="HgProjectHelper.__hgPreviewBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPreviewBundle" /> <keyword name="HgProjectHelper.__hgPull" id="HgProjectHelper.__hgPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPull" /> <keyword name="HgProjectHelper.__hgPush" id="HgProjectHelper.__hgPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPush" /> + <keyword name="HgProjectHelper.__hgPushForced" id="HgProjectHelper.__hgPushForced" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPushForced" /> <keyword name="HgProjectHelper.__hgRecover" id="HgProjectHelper.__hgRecover" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgRecover" /> <keyword name="HgProjectHelper.__hgResolve" id="HgProjectHelper.__hgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgResolve" /> <keyword name="HgProjectHelper.__hgShowBranch" id="HgProjectHelper.__hgShowBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgShowBranch" /> @@ -9771,6 +9792,8 @@ <file>eric5.Helpviewer.History.HistoryTreeModel.html</file> <file>eric5.Helpviewer.JavaScriptResources.html</file> <file>eric5.Helpviewer.Network.AboutAccessHandler.html</file> + <file>eric5.Helpviewer.Network.FtpAccessHandler.html</file> + <file>eric5.Helpviewer.Network.FtpReply.html</file> <file>eric5.Helpviewer.Network.NetworkAccessManager.html</file> <file>eric5.Helpviewer.Network.NetworkAccessManagerProxy.html</file> <file>eric5.Helpviewer.Network.NetworkDiskCache.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Helpviewer.Network.FtpAccessHandler.html Mon May 24 18:38:54 2010 +0200 @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Helpviewer.Network.FtpAccessHandler</title> +<style> +body { + background:white; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #4FA4FF; } +h2 { color: white; background: #4FA4FF; } +h3 { color: white; background: #00557F; } +h4 { color: white; background: #00557F; } + +a { color: #AA5500; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Helpviewer.Network.FtpAccessHandler</h1> +<p> +Module implementing a scheme access handler for FTP. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#FtpAccessHandler">FtpAccessHandler</a></td> +<td>Class implementing a scheme access handler for FTP.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="FtpAccessHandler" ID="FtpAccessHandler"></a> +<h2>FtpAccessHandler</h2> +<p> + Class implementing a scheme access handler for FTP. +</p> +<h3>Derived from</h3> +SchemeAccessHandler +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#FtpAccessHandler.createRequest">createRequest</a></td> +<td>Protected method to create a request.</td> +</tr> +</table> +<a NAME="FtpAccessHandler.createRequest" ID="FtpAccessHandler.createRequest"></a> +<h4>FtpAccessHandler.createRequest</h4> +<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<p> + Protected method to create a request. +</p><dl> +<dt><i>op</i></dt> +<dd> +the operation to be performed (QNetworkAccessManager.Operation) +</dd><dt><i>request</i></dt> +<dd> +reference to the request object (QNetworkRequest) +</dd><dt><i>outgoingData</i></dt> +<dd> +reference to an IODevice containing data to be sent + (QIODevice) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the created reply object (QNetworkReply) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Helpviewer.Network.FtpReply.html Mon May 24 18:38:54 2010 +0200 @@ -0,0 +1,224 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Helpviewer.Network.FtpReply</title> +<style> +body { + background:white; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #4FA4FF; } +h2 { color: white; background: #4FA4FF; } +h3 { color: white; background: #00557F; } +h4 { color: white; background: #00557F; } + +a { color: #AA5500; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Helpviewer.Network.FtpReply</h1> +<p> +Module implementing a network reply class for FTP resources. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>ftpListPage_html</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#FtpReply">FtpReply</a></td> +<td>Class implementing a network reply for FTP resources.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="FtpReply" ID="FtpReply"></a> +<h2>FtpReply</h2> +<p> + Class implementing a network reply for FTP resources. +</p> +<h3>Derived from</h3> +QNetworkReply +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#FtpReply.__init__">FtpReply</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#FtpReply.__commandStarted">__commandStarted</a></td> +<td>Private slot to handle the start of FTP commands.</td> +</tr><tr> +<td><a href="#FtpReply.__connectToHost">__connectToHost</a></td> +<td>Private slot to start the FTP process by connecting to the host.</td> +</tr><tr> +<td><a href="#FtpReply.__cssLinkClass">__cssLinkClass</a></td> +<td>Private method to generate a link class with an icon.</td> +</tr><tr> +<td><a href="#FtpReply.__processCommand">__processCommand</a></td> +<td>Private slot to handle the end of FTP commands.</td> +</tr><tr> +<td><a href="#FtpReply.__processData">__processData</a></td> +<td>Private slot to process data from the FTP server.</td> +</tr><tr> +<td><a href="#FtpReply.__processListInfo">__processListInfo</a></td> +<td>Private slot to process list information from the FTP server.</td> +</tr><tr> +<td><a href="#FtpReply.__setContent">__setContent</a></td> +<td>Private method to set the finish the setup of the data.</td> +</tr><tr> +<td><a href="#FtpReply.__setListContent">__setListContent</a></td> +<td>Private method to prepare the content for the reader.</td> +</tr><tr> +<td><a href="#FtpReply.abort">abort</a></td> +<td>Public slot to abort the operation.</td> +</tr><tr> +<td><a href="#FtpReply.bytesAvailable">bytesAvailable</a></td> +<td>Public method to determined the bytes available for being read.</td> +</tr><tr> +<td><a href="#FtpReply.isSequential">isSequential</a></td> +<td>Public method to check for sequential access.</td> +</tr><tr> +<td><a href="#FtpReply.readData">readData</a></td> +<td>Protected method to retrieve data from the reply object.</td> +</tr> +</table> +<a NAME="FtpReply.__init__" ID="FtpReply.__init__"></a> +<h4>FtpReply (Constructor)</h4> +<b>FtpReply</b>(<i>url, parent = None</i>) +<p> + Constructor +</p><dl> +<dt><i>url</i></dt> +<dd> +requested FTP URL (QUrl) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent object (QObject) +</dd> +</dl><a NAME="FtpReply.__commandStarted" ID="FtpReply.__commandStarted"></a> +<h4>FtpReply.__commandStarted</h4> +<b>__commandStarted</b>(<i>id</i>) +<p> + Private slot to handle the start of FTP commands. +</p><dl> +<dt><i>id</i></dt> +<dd> +id of the command to be processed (integer) (ignored) +</dd> +</dl><a NAME="FtpReply.__connectToHost" ID="FtpReply.__connectToHost"></a> +<h4>FtpReply.__connectToHost</h4> +<b>__connectToHost</b>(<i></i>) +<p> + Private slot to start the FTP process by connecting to the host. +</p><a NAME="FtpReply.__cssLinkClass" ID="FtpReply.__cssLinkClass"></a> +<h4>FtpReply.__cssLinkClass</h4> +<b>__cssLinkClass</b>(<i>icon, size = 32</i>) +<p> + Private method to generate a link class with an icon. +</p><dl> +<dt><i>icon</i></dt> +<dd> +icon to be included (QIcon) +</dd><dt><i>size</i></dt> +<dd> +size of the icon to be generated (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +CSS class string (string) +</dd> +</dl><a NAME="FtpReply.__processCommand" ID="FtpReply.__processCommand"></a> +<h4>FtpReply.__processCommand</h4> +<b>__processCommand</b>(<i>id, error</i>) +<p> + Private slot to handle the end of FTP commands. +</p><dl> +<dt><i>id</i></dt> +<dd> +id of the command to be processed (integer) (ignored) +</dd><dt><i>error</i></dt> +<dd> +flag indicating an error condition (boolean) +</dd> +</dl><a NAME="FtpReply.__processData" ID="FtpReply.__processData"></a> +<h4>FtpReply.__processData</h4> +<b>__processData</b>(<i></i>) +<p> + Private slot to process data from the FTP server. +</p><a NAME="FtpReply.__processListInfo" ID="FtpReply.__processListInfo"></a> +<h4>FtpReply.__processListInfo</h4> +<b>__processListInfo</b>(<i>urlInfo</i>) +<p> + Private slot to process list information from the FTP server. +</p><dl> +<dt><i>urlInfo</i></dt> +<dd> +reference to the information object (QUrlInfo) +</dd> +</dl><a NAME="FtpReply.__setContent" ID="FtpReply.__setContent"></a> +<h4>FtpReply.__setContent</h4> +<b>__setContent</b>(<i></i>) +<p> + Private method to set the finish the setup of the data. +</p><a NAME="FtpReply.__setListContent" ID="FtpReply.__setListContent"></a> +<h4>FtpReply.__setListContent</h4> +<b>__setListContent</b>(<i></i>) +<p> + Private method to prepare the content for the reader. +</p><a NAME="FtpReply.abort" ID="FtpReply.abort"></a> +<h4>FtpReply.abort</h4> +<b>abort</b>(<i></i>) +<p> + Public slot to abort the operation. +</p><a NAME="FtpReply.bytesAvailable" ID="FtpReply.bytesAvailable"></a> +<h4>FtpReply.bytesAvailable</h4> +<b>bytesAvailable</b>(<i></i>) +<p> + Public method to determined the bytes available for being read. +</p><dl> +<dt>Returns:</dt> +<dd> +bytes available (integer) +</dd> +</dl><a NAME="FtpReply.isSequential" ID="FtpReply.isSequential"></a> +<h4>FtpReply.isSequential</h4> +<b>isSequential</b>(<i></i>) +<p> + Public method to check for sequential access. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating sequential access (boolean) +</dd> +</dl><a NAME="FtpReply.readData" ID="FtpReply.readData"></a> +<h4>FtpReply.readData</h4> +<b>readData</b>(<i>maxlen</i>) +<p> + Protected method to retrieve data from the reply object. +</p><dl> +<dt><i>maxlen</i></dt> +<dd> +maximum number of bytes to read (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +string containing the data (bytes) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Helpviewer.Network.NetworkReply.html Sun May 23 15:09:37 2010 +0200 +++ b/Documentation/Source/eric5.Helpviewer.Network.NetworkReply.html Mon May 24 18:38:54 2010 +0200 @@ -114,7 +114,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -string containing the data (string) +string containing the data (bytes) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun May 23 15:09:37 2010 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Mon May 24 18:38:54 2010 +0200 @@ -129,6 +129,9 @@ <td><a href="#HgProjectHelper.__hgPush">__hgPush</a></td> <td>Private slot used to push changes to a remote repository.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgPushForced">__hgPushForced</a></td> +<td>Private slot used to push changes to a remote repository using the force option.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgRecover">__hgRecover</a></td> <td>Protected slot used to recover from an interrupted transaction.</td> </tr><tr> @@ -305,6 +308,12 @@ <b>__hgPush</b>(<i></i>) <p> Private slot used to push changes to a remote repository. +</p><a NAME="HgProjectHelper.__hgPushForced" ID="HgProjectHelper.__hgPushForced"></a> +<h4>HgProjectHelper.__hgPushForced</h4> +<b>__hgPushForced</b>(<i></i>) +<p> + Private slot used to push changes to a remote repository using + the force option. </p><a NAME="HgProjectHelper.__hgRecover" ID="HgProjectHelper.__hgRecover"></a> <h4>HgProjectHelper.__hgRecover</h4> <b>__hgRecover</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sun May 23 15:09:37 2010 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon May 24 18:38:54 2010 +0200 @@ -586,13 +586,16 @@ </dd> </dl><a NAME="Hg.hgPush" ID="Hg.hgPush"></a> <h4>Hg.hgPush</h4> -<b>hgPush</b>(<i>name</i>) +<b>hgPush</b>(<i>name, force = False</i>) <p> Public method used to push changes to a remote Mercurial repository. </p><dl> <dt><i>name</i></dt> <dd> directory name of the project to be pushed from (string) +</dd><dt><i>force=</i></dt> +<dd> +flag indicating a forced push (boolean) </dd> </dl><a NAME="Hg.hgRecover" ID="Hg.hgRecover"></a> <h4>Hg.hgRecover</h4>
--- a/Documentation/Source/index-eric5.Helpviewer.Network.html Sun May 23 15:09:37 2010 +0200 +++ b/Documentation/Source/index-eric5.Helpviewer.Network.html Mon May 24 18:38:54 2010 +0200 @@ -32,6 +32,12 @@ <td><a href="eric5.Helpviewer.Network.AboutAccessHandler.html">AboutAccessHandler</a></td> <td>Module implementing a scheme access handler for about schemes.</td> </tr><tr> +<td><a href="eric5.Helpviewer.Network.FtpAccessHandler.html">FtpAccessHandler</a></td> +<td>Module implementing a scheme access handler for FTP.</td> +</tr><tr> +<td><a href="eric5.Helpviewer.Network.FtpReply.html">FtpReply</a></td> +<td>Module implementing a network reply class for FTP resources.</td> +</tr><tr> <td><a href="eric5.Helpviewer.Network.NetworkAccessManager.html">NetworkAccessManager</a></td> <td>Module implementing a QNetworkAccessManager subclass.</td> </tr><tr>
--- a/Helpviewer/DownloadDialog.py Sun May 23 15:09:37 2010 +0200 +++ b/Helpviewer/DownloadDialog.py Mon May 24 18:38:54 2010 +0200 @@ -122,13 +122,12 @@ defaultFileName = self.__saveFileName(downloadDirectory) fileName = defaultFileName - baseName = QFileInfo(fileName).completeBaseName() self.__autoOpen = False if not self.__toDownload: res = QMessageBox.question(None, self.trUtf8("Downloading"), self.trUtf8("""<p>You are about to download the file <b>{0}</b>.</p>""" - """<p>What do you want to do?</p>""").format(baseName), + """<p>What do you want to do?</p>""").format(fileName), QMessageBox.StandardButtons(\ QMessageBox.Open | \ QMessageBox.Save | \ @@ -140,7 +139,7 @@ self.__autoOpen = res == QMessageBox.Open fileName = QDesktopServices.storageLocation(QDesktopServices.TempLocation) + \ - '/' + baseName + '/' + fileName if not self.__autoOpen and self.__requestFilename: fileName = QFileDialog.getSaveFileName( @@ -317,12 +316,12 @@ """ self.__bytesReceived = received if total == -1: + self.progressBar.setMaximum(0) self.progressBar.setValue(0) - self.progressBar.setMaximum(0) self.setWindowTitle(self.__windowTitleTemplate.format("")) else: + self.progressBar.setMaximum(total) self.progressBar.setValue(received) - self.progressBar.setMaximum(total) pc = "{0}%".format(received * 100 // total) self.setWindowTitle(self.__windowTitleTemplate.format(pc)) self.__updateInfoLabel()
--- a/Helpviewer/HTMLResources.py Sun May 23 15:09:37 2010 +0200 +++ b/Helpviewer/HTMLResources.py Mon May 24 18:38:54 2010 +0200 @@ -23,21 +23,22 @@ }} #box {{ background: white; - border: 1px solid lightgray; + border: 1px solid #85784A; width: 600px; padding: 60px; margin: auto; + -webkit-border-radius: 0.8em; }} h1 {{ font-size: 130%; font-weight: bold; - border-bottom: 1px solid lightgray; + border-bottom: 1px solid #85784A; margin-left: 48px; }} h2 {{ font-size: 100%; font-weight: normal; - border-bottom: 1px solid lightgray; + border-bottom: 1px solid #85784A; margin-left: 48px; }} ul {{
--- a/Helpviewer/HelpBrowserWV.py Sun May 23 15:09:37 2010 +0200 +++ b/Helpviewer/HelpBrowserWV.py Mon May 24 18:38:54 2010 +0200 @@ -221,7 +221,7 @@ imageBuffer.open(QIODevice.ReadWrite) if pixmap.save(imageBuffer, "PNG"): html = html.replace("IMAGE_BINARY_DATA_HERE", - bytes(imageBuffer.buffer().toBase64()).decode()) + str(imageBuffer.buffer().toBase64(), encoding="ascii")) errorPage.content = QByteArray(html.format( title, info.errorString, @@ -425,7 +425,7 @@ self.trUtf8("""<p>Could not start a viewer""" """ for file <b>{0}</b>.</p>""").format(name.path())) return - elif name.scheme() in ["mailto", "ftp"]: + elif name.scheme() in ["mailto"]: started = QDesktopServices.openUrl(name) if not started: QMessageBox.critical(self, @@ -924,6 +924,7 @@ if reply.error() == QNetworkReply.NoError: if reply.url().isEmpty(): return + parent = QUrl(reply.url().toString().rsplit("/", 1)[0] + "/") size = reply.header(QNetworkRequest.ContentLengthHeader) if size == 0: return @@ -935,6 +936,7 @@ self.connect(dlg, SIGNAL("done()"), self.__downloadDone) self.__downloadWindows.append(dlg) dlg.show() + self.setUrl(parent) else: replyUrl = reply.url() if replyUrl.isEmpty(): @@ -950,7 +952,7 @@ imageBuffer.open(QIODevice.ReadWrite) if pixmap.save(imageBuffer, "PNG"): html = html.replace("IMAGE_BINARY_DATA_HERE", - bytes(imageBuffer.buffer().toBase64()).decode()) + str(imageBuffer.buffer().toBase64(), encoding="ascii")) html = html.format( title, reply.errorString(),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Helpviewer/Network/FtpAccessHandler.py Mon May 24 18:38:54 2010 +0200 @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2010 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a scheme access handler for FTP. +""" + +from PyQt4.QtNetwork import QNetworkAccessManager + +from .SchemeAccessHandler import SchemeAccessHandler +from .FtpReply import FtpReply + +class FtpAccessHandler(SchemeAccessHandler): + """ + Class implementing a scheme access handler for FTP. + """ + def createRequest(self, op, request, outgoingData = None): + """ + Protected method to create a request. + + @param op the operation to be performed (QNetworkAccessManager.Operation) + @param request reference to the request object (QNetworkRequest) + @param outgoingData reference to an IODevice containing data to be sent + (QIODevice) + @return reference to the created reply object (QNetworkReply) + """ + if op == QNetworkAccessManager.GetOperation: + return FtpReply(request.url(), self.parent()) + else: + return None
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Helpviewer/Network/FtpReply.py Mon May 24 18:38:54 2010 +0200 @@ -0,0 +1,355 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2010 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a network reply class for FTP resources. +""" + +from PyQt4.QtCore import QByteArray, QIODevice, Qt, QUrl, QTimer, QBuffer +from PyQt4.QtGui import QPixmap +from PyQt4.QtNetwork import QFtp, QNetworkReply, QNetworkRequest, QUrlInfo +from PyQt4.QtWebKit import QWebSettings + +import UI.PixmapCache + +ftpListPage_html = """\ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<title>{0}</title> +<style type="text/css"> +body {{ + padding: 3em 0em; + background: -webkit-gradient(linear, left top, left bottom, from(#85784A), to(#FDFDFD), color-stop(0.5, #FDFDFD)); + background-repeat: repeat-x; +}} +#box {{ + background: white; + border: 1px solid #85784A; + width: 80%; + padding: 30px; + margin: auto; + -webkit-border-radius: 0.8em; +}} +h1 {{ + font-size: 130%; + font-weight: bold; + border-bottom: 1px solid #85784A; +}} +th {{ + background-color: #B8B096; + color: black; +}} +table {{ + border: solid 1px #85784A; + margin: 5px 0; + width: 100%; +}} +tr.odd {{ + background-color: white; + color: black; +}} +tr.even {{ + background-color: #CEC9B8; + color: black; +}} +.modified {{ + text-align: left; + vertical-align: top; + white-space: nowrap; +}} +.size {{ + text-align: right; + vertical-align: top; + white-space: nowrap; + padding-right: 22px; +}} +.name {{ + text-align: left; + vertical-align: top; + white-space: pre-wrap; + width: 100% +}} +{1} +</style> +</head> +<body> + <div id="box"> + <h1>{2}</h1> +{3} + <table align="center" cellspacing="0" width="90%"> +{4} + </table> + </div> +</body> +</html> +""" + +class FtpReply(QNetworkReply): + """ + Class implementing a network reply for FTP resources. + """ + def __init__(self, url, parent = None): + """ + Constructor + + @param url requested FTP URL (QUrl) + @param parent reference to the parent object (QObject) + """ + QNetworkReply.__init__(self, parent) + + self.__ftp = QFtp(self) + self.__ftp.listInfo.connect(self.__processListInfo) + self.__ftp.readyRead.connect(self.__processData) + self.__ftp.commandFinished.connect(self.__processCommand) + self.__ftp.commandStarted.connect(self.__commandStarted) + self.__ftp.dataTransferProgress.connect(self.downloadProgress) + + self.__items = [] + self.__content = QByteArray() + self.__units = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"] + + self.setUrl(url) + QTimer.singleShot(0, self.__connectToHost) + + def abort(self): + """ + Public slot to abort the operation. + """ + # do nothing + pass + + def bytesAvailable(self): + """ + Public method to determined the bytes available for being read. + + @return bytes available (integer) + """ + return self.__content.size() + + def isSequential(self): + """ + Public method to check for sequential access. + + @return flag indicating sequential access (boolean) + """ + return True + + def readData(self, maxlen): + """ + Protected method to retrieve data from the reply object. + + @param maxlen maximum number of bytes to read (integer) + @return string containing the data (bytes) + """ + if self.__content.size(): + len_ = min(maxlen, self.__content.size()) + buffer = bytes(self.__content[:len_]) + self.__content.remove(0, len_) + return buffer + + def __connectToHost(self): + """ + Private slot to start the FTP process by connecting to the host. + """ + self.__ftp.connectToHost(self.url().host()) + + def __commandStarted(self, id): + """ + Private slot to handle the start of FTP commands. + + @param id id of the command to be processed (integer) (ignored) + """ + cmd = self.__ftp.currentCommand() + if cmd == QFtp.Get: + self.__setContent() + + def __processCommand(self, id, error): + """ + Private slot to handle the end of FTP commands. + + @param id id of the command to be processed (integer) (ignored) + @param error flag indicating an error condition (boolean) + """ + if error: + if error == QFtp.HostNotFound: + err = QNetworkReply.HostNotFoundError + elif error == QFtp.ConnectionRefused: + err = QNetworkReply.ConnectionRefusedError + else: + err = QNetworkReply.ContentNotFoundError + self.setError(err, self.__ftp.errorString()) + self.error.emit(err) + return + + cmd = self.__ftp.currentCommand() + if cmd == QFtp.ConnectToHost: + self.__ftp.login() + elif cmd == QFtp.Login: + self.__ftp.list(self.url().path()) + elif cmd == QFtp.List: + if len(self.__items) == 1 and \ + self.__items[0].isFile(): + self.__ftp.get(self.url().path()) + else: + self.__setListContent() + elif cmd == QFtp.Get: + self.finished.emit() + self.__ftp.close() + + def __processListInfo(self, urlInfo): + """ + Private slot to process list information from the FTP server. + + @param urlInfo reference to the information object (QUrlInfo) + """ + self.__items.append(QUrlInfo(urlInfo)) + + def __processData(self): + """ + Private slot to process data from the FTP server. + """ + self.__content += self.__ftp.readAll() + self.readyRead.emit() + + def __setContent(self): + """ + Private method to set the finish the setup of the data. + """ + self.open(QIODevice.ReadOnly | QIODevice.Unbuffered) + self.setHeader(QNetworkRequest.ContentLengthHeader, self.__items[0].size()) + self.setAttribute(QNetworkRequest.HttpStatusCodeAttribute, 200) + self.setAttribute(QNetworkRequest.HttpReasonPhraseAttribute, "Ok") + self.metaDataChanged.emit() + + def __cssLinkClass(self, icon, size = 32): + """ + Private method to generate a link class with an icon. + + @param icon icon to be included (QIcon) + @param size size of the icon to be generated (integer) + @return CSS class string (string) + """ + cssString = \ + """a.{{0}} {{{{\n"""\ + """ padding-left: {0}px;\n"""\ + """ background: transparent url(data:image/png;base64,{1}) no-repeat center left;\n"""\ + """ font-weight: bold;\n"""\ + """}}}}\n""" + pixmap = icon.pixmap(size, size) + imageBuffer = QBuffer() + imageBuffer.open(QIODevice.ReadWrite) + if not pixmap.save(imageBuffer, "PNG"): + # write a blank pixmap on error + pixmap = QPixmap(size, size) + pixmap.fill(Qt.transparent) + imageBuffer.buffer().clear() + pixmap.save(imageBuffer, "PNG") + return cssString.format(size + 4, + str(imageBuffer.buffer().toBase64(), encoding="ascii")) + + def __setListContent(self): + """ + Private method to prepare the content for the reader. + """ + u = self.url() + if not u.path().endswith("/"): + u.setPath(u.path() + "/") + + baseUrl = self.url().toString() + basePath = u.path() + + linkClasses = {} + iconSize = QWebSettings.globalSettings().fontSize(QWebSettings.DefaultFontSize); + + parent = u.resolved(QUrl("..")) + if parent.isParentOf(u): + icon = UI.PixmapCache.getIcon("up.png") + linkClasses["link_parent"] = \ + self.__cssLinkClass(icon, iconSize).format("link_parent") + parentStr = self.trUtf8( + """ <p><a class="link_parent" href="{0}">""" + """Change to parent directory</a></p>""" + ).format(parent.toString()) + else: + parentStr = "" + + row = \ + """ <tr class="{0}">"""\ + """<td class="name"><a class="{1}" href="{2}">{3}</a></td>"""\ + """<td class="size">{4}</td>"""\ + """<td class="modified">{5}</td>"""\ + """</tr>\n""" + table = self.trUtf8( + """ <tr>""" + """<th align="left">Name</th>""" + """<th>Size</th>""" + """<th align="left">Last modified</th>""" + """</tr>\n""" + ) + + i = 0 + for item in self.__items: + name = item.name() + if item.isDir() and not name.endswith("/"): + name += "/" + child = u.resolved(QUrl(name.replace(":", "%3A"))) + + if item.isFile(): + size = item.size() + unit = 0 + while size: + newSize = size // 1024 + if newSize and unit < len(self.__units): + size = newSize + unit += 1 + else: + break + + sizeStr = self.trUtf8("{0} {1}", "size unit")\ + .format(size, self.__units[unit]) + linkClass = "link_file" + if linkClass not in linkClasses: + icon = UI.PixmapCache.getIcon("fileMisc.png") + linkClasses[linkClass] = \ + self.__cssLinkClass(icon, iconSize).format(linkClass) + else: + sizeStr = "" + linkClass = "link_dir" + if linkClass not in linkClasses: + icon = UI.PixmapCache.getIcon("dirClosed.png") + linkClasses[linkClass] = \ + self.__cssLinkClass(icon, iconSize).format(linkClass) + table += row.format( + i == 0 and "odd" or "even", + linkClass, + child.toString(), + Qt.escape(item.name()), + sizeStr, + item.lastModified().toString("yyyy-MM-dd hh:mm"), + ) + i = 1 - i + + content = ftpListPage_html.format( + Qt.escape(baseUrl), + "".join(linkClasses.values()), + self.trUtf8("Listing of {0}").format(basePath), + parentStr, + table + ) + self.__content = QByteArray(content.encode("utf8")) + + self.open(QIODevice.ReadOnly | QIODevice.Unbuffered) + self.setHeader(QNetworkRequest.ContentTypeHeader, "text/html; charset=UTF-8") + self.setHeader(QNetworkRequest.ContentLengthHeader, self.__content.size()) + self.setAttribute(QNetworkRequest.HttpStatusCodeAttribute, 200) + self.setAttribute(QNetworkRequest.HttpReasonPhraseAttribute, "Ok") + self.metaDataChanged.emit() + self.downloadProgress.emit(self.__content.size(), self.__content.size()) + self.readyRead.emit() + self.finished.emit() + self.__ftp.close()
--- a/Helpviewer/Network/NetworkAccessManager.py Sun May 23 15:09:37 2010 +0200 +++ b/Helpviewer/Network/NetworkAccessManager.py Mon May 24 18:38:54 2010 +0200 @@ -31,6 +31,7 @@ from .QtHelpAccessHandler import QtHelpAccessHandler from .PyrcAccessHandler import PyrcAccessHandler from .AboutAccessHandler import AboutAccessHandler +from .FtpAccessHandler import FtpAccessHandler from Helpviewer.AdBlock.AdBlockAccessHandler import AdBlockAccessHandler @@ -89,6 +90,7 @@ self.setSchemeHandler("pyrc", PyrcAccessHandler(self)) self.setSchemeHandler("about", AboutAccessHandler(self)) self.setSchemeHandler("abp", AdBlockAccessHandler(self)) + self.setSchemeHandler("ftp", FtpAccessHandler(self)) def setSchemeHandler(self, scheme, handler): """
--- a/Helpviewer/Network/NetworkReply.py Sun May 23 15:09:37 2010 +0200 +++ b/Helpviewer/Network/NetworkReply.py Mon May 24 18:38:54 2010 +0200 @@ -58,7 +58,7 @@ Protected method to retrieve data from the reply object. @param maxlen maximum number of bytes to read (integer) - @return string containing the data (string) + @return string containing the data (bytes) """ len_ = min(maxlen, self.__data.length()) buffer = bytes(self.__data[:len_])
--- a/changelog Sun May 23 15:09:37 2010 +0200 +++ b/changelog Mon May 24 18:38:54 2010 +0200 @@ -3,6 +3,7 @@ Version 5.1-snapshot-2010mmdd: - bug fixes - added an action to perform a 'hg push -f' to the Mercurial plug-in +- added a handler for ftp: URLs to the web browser Version 5.0-snapshot-20100523: - bug fixes
--- a/eric5.e4p Sun May 23 15:09:37 2010 +0200 +++ b/eric5.e4p Mon May 24 18:38:54 2010 +0200 @@ -800,6 +800,8 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py</Source> <Source>E5Network/E5NetworkProxyFactory.py</Source> + <Source>Helpviewer/Network/FtpAccessHandler.py</Source> + <Source>Helpviewer/Network/FtpReply.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form>
--- a/i18n/eric5_cs.ts Sun May 23 15:09:37 2010 +0200 +++ b/i18n/eric5_cs.ts Mon May 24 18:38:54 2010 +0200 @@ -5614,7 +5614,7 @@ <translation>Stop</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="146"/> + <location filename="Helpviewer/DownloadDialog.py" line="145"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> @@ -5654,7 +5654,7 @@ <translation type="obsolete">%1 z %2 (%3/sec) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="360"/> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>?</source> <translation>?</translation> </message> @@ -5669,22 +5669,22 @@ <translation type="obsolete">%1 z %2 - zastaveno</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="385"/> + <location filename="Helpviewer/DownloadDialog.py" line="384"/> <source>bytes</source> <translation>bajtů</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="388"/> + <location filename="Helpviewer/DownloadDialog.py" line="387"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="391"/> + <location filename="Helpviewer/DownloadDialog.py" line="390"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source>Downloading</source> <translation>Stahování</translation> </message> @@ -5699,52 +5699,52 @@ <translation type="unfinished">Eric4 Download {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="157"/> + <location filename="Helpviewer/DownloadDialog.py" line="156"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="270"/> + <location filename="Helpviewer/DownloadDialog.py" line="269"/> <source>Error opening save file: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="277"/> + <location filename="Helpviewer/DownloadDialog.py" line="276"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="294"/> + <location filename="Helpviewer/DownloadDialog.py" line="293"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <location filename="Helpviewer/DownloadDialog.py" line="349"/> <source>- {0}:{1:02} minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="357"/> + <location filename="Helpviewer/DownloadDialog.py" line="356"/> <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="359"/> + <location filename="Helpviewer/DownloadDialog.py" line="358"/> <source>{0} of {1} ({2}/sec) {3}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="368"/> + <location filename="Helpviewer/DownloadDialog.py" line="367"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="371"/> + <location filename="Helpviewer/DownloadDialog.py" line="370"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> @@ -11793,6 +11793,31 @@ </message> </context> <context> + <name>FtpReply</name> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="274"/> + <source> <p><a class="link_parent" href="{0}">Change to parent directory</a></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="287"/> + <source> <tr><th align="left">Name</th><th>Size</th><th align="left">Last modified</th></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="313"/> + <source>{0} {1}</source> + <comment>size unit</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="337"/> + <source>Listing of {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GotoDialog</name> <message> <location filename="QScintilla/GotoDialog.ui" line="13"/> @@ -11976,17 +12001,17 @@ <translation type="obsolete">Při připojení na: %1.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation>Zkontrolujte adresu na chyby jako je <b>ww</b>.example.org místo <b>www</b>.example.org</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If the address is correct, try checking the network connection.</source> <translation>Je-li adresa vpořádku, prověřte síťové spojení.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation>Je-li vaše šíť chráněna firewallem nebo proxy, ujistěte se, že váš prohlížeč má na tuto síť povolen přístup.</translation> </message> @@ -12066,12 +12091,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="945"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="947"/> <source>Error loading page: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>When connecting to: {0}.</source> <translation type="unfinished"></translation> </message> @@ -22044,7 +22069,7 @@ <translation type="obsolete"><b>Připojit k proxy '%1' za použití:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source>SSL Errors</source> <translation>SSL chyby</translation> </message> @@ -22054,7 +22079,7 @@ <translation type="obsolete"><p>SSL chyby pro <br /><b>%1</b><ul><li>%2</li></ul></p><p>Chcete tyto chyby ignorovat?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source>Certificates</source> <translation>Certifikáty</translation> </message> @@ -22079,42 +22104,42 @@ <translation type="obsolete"><br/>Alternativní jména:<ul><li>%1</li></ul></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="159"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="161"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="162"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="164"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="189"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="191"/> <source><b>Connect to proxy '{0}' using:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="281"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="283"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="291"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="293"/> <source><br/>Alternate Names:<ul><li>{0}</li></ul></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sun May 23 15:09:37 2010 +0200 +++ b/i18n/eric5_de.ts Mon May 24 18:38:54 2010 +0200 @@ -5310,72 +5310,72 @@ <translation>Anhalten</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="146"/> + <location filename="Helpviewer/DownloadDialog.py" line="145"/> <source>Save File</source> <translation>Datei speichern</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="157"/> + <location filename="Helpviewer/DownloadDialog.py" line="156"/> <source>Download canceled: {0}</source> <translation>Download abgebrochen: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="270"/> + <location filename="Helpviewer/DownloadDialog.py" line="269"/> <source>Error opening save file: {0}</source> <translation>Fehler beim Öffnen der zu speichernden Datei: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="277"/> + <location filename="Helpviewer/DownloadDialog.py" line="276"/> <source>Error saving: {0}</source> <translation>Fehler beim Speichern: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="294"/> + <location filename="Helpviewer/DownloadDialog.py" line="293"/> <source>Network Error: {0}</source> <translation>Netzwerkfehler: {0}</translation> </message> <message> + <location filename="Helpviewer/DownloadDialog.py" line="358"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation>{0} von {1} ({2}/s) {3}</translation> + </message> + <message> <location filename="Helpviewer/DownloadDialog.py" line="359"/> - <source>{0} of {1} ({2}/sec) {3}</source> - <translation>{0} von {1} ({2}/s) {3}</translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="360"/> <source>?</source> <translation>?</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="368"/> + <location filename="Helpviewer/DownloadDialog.py" line="367"/> <source>{0} downloaded</source> <translation>{0} heruntergeladen</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="371"/> + <location filename="Helpviewer/DownloadDialog.py" line="370"/> <source>{0} of {1} - Stopped</source> <translation>{0} von {1} - Angehalten</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="385"/> + <location filename="Helpviewer/DownloadDialog.py" line="384"/> <source>bytes</source> <translation>Bytes</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="388"/> + <location filename="Helpviewer/DownloadDialog.py" line="387"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="391"/> + <location filename="Helpviewer/DownloadDialog.py" line="390"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source>Downloading</source> <translation>Download</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation><p>Sie sind dabei, die Datei <b>{0}</b> herunterzuladen.</p><p>Was wollen sie tun?</p></translation> </message> @@ -5385,12 +5385,12 @@ <translation>Eric5 Download</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <location filename="Helpviewer/DownloadDialog.py" line="349"/> <source>- {0}:{1:02} minutes remaining</source> <translation>- {0}:{1:02} Minuten verbleiben</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="357"/> + <location filename="Helpviewer/DownloadDialog.py" line="356"/> <source>- {0} seconds remaining</source> <translation>- {0} Sekunden verbleiben</translation> </message> @@ -10941,6 +10941,32 @@ </message> </context> <context> + <name>FtpReply</name> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="274"/> + <source> <p><a class="link_parent" href="{0}">Change to parent directory</a></p></source> + <translation> <p><a class="link_parent" href="{0}">In den übergeordneten Ordner wechseln</a></p></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="287"/> + <source> <tr><th align="left">Name</th><th>Size</th><th align="left">Last modified</th></tr> +</source> + <translation> <tr><th align="left">Name</th><th>Größe</th><th align="left">Zuletzt verändert</th></tr> +</translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="313"/> + <source>{0} {1}</source> + <comment>size unit</comment> + <translation>{0} {1}</translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="337"/> + <source>Listing of {0}</source> + <translation>Index von {0}</translation> + </message> +</context> +<context> <name>GotoDialog</name> <message> <location filename="QScintilla/GotoDialog.ui" line="13"/> @@ -11114,27 +11140,27 @@ <translation>Web Inspektor...</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="945"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="947"/> <source>Error loading page: {0}</source> <translation>Fehler beim Laden von: {0}</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>When connecting to: {0}.</source> <translation>Beim Verbinden zu: {0}.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation>Überprüfen Sie die Adresse auf Fehler wie <b>ww</b>.example.org statt <b>www</b>.example.org</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If the address is correct, try checking the network connection.</source> <translation>Falls die Adresse stimmt, versuchen Sie, die Netzwerkverbindung zu überprüfen.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation>Wenn Ihr Computer oder Ihr Netzwerk durch eine Firewall oder einen Proxy geschützt ist, stellen Sie sicher, dass der Browser auf das Netzwerk zugreifen darf.</translation> </message> @@ -20777,52 +20803,52 @@ <translation type="obsolete">Proxyverwendung ist aktiviert, aber kein Proxyrechner ist konfiguriert.</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="159"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="161"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Gib Nutzernamen und Passwort für '{0}' ein</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="162"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="164"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Gib Nutzernamen und Passwort für '{0}' und Realm '{1}' ein</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="189"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="191"/> <source><b>Connect to proxy '{0}' using:</b></source> <translation><b>Verbinden zu Proxy '{0}' mit:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source>SSL Errors</source> <translation>SSL Fehler</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL Fehler für <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Sollen diese Fehler ignoriert werden?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source>Certificates</source> <translation>Zertifikate</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Zertifikate:<br/>{0}<br/>Sollen alle diese Zertifikate akzeptiert werden?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="281"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="283"/> <source><br/>Issuer: {0}</source> <translation><br/>Aussteller: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Gültig ab: {0}<br/>Gültig bis: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="291"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="293"/> <source><br/>Alternate Names:<ul><li>{0}</li></ul></source> <translation><br/>Alternative Namen:<ul><li>{0}</li></ul></translation> </message>
--- a/i18n/eric5_es.ts Sun May 23 15:09:37 2010 +0200 +++ b/i18n/eric5_es.ts Mon May 24 18:38:54 2010 +0200 @@ -5307,32 +5307,32 @@ <translation>Parar</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="146"/> + <location filename="Helpviewer/DownloadDialog.py" line="145"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="360"/> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>?</source> <translation>?</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="385"/> + <location filename="Helpviewer/DownloadDialog.py" line="384"/> <source>bytes</source> <translation>bytes</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="388"/> + <location filename="Helpviewer/DownloadDialog.py" line="387"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="391"/> + <location filename="Helpviewer/DownloadDialog.py" line="390"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source>Downloading</source> <translation>Descargando</translation> </message> @@ -5342,52 +5342,52 @@ <translation>Descarga de Eric5</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation><p>Está a punto de descargar el archivo <b>{0}</b>.</p><p>¿Qué desea hacer?</p></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="157"/> + <location filename="Helpviewer/DownloadDialog.py" line="156"/> <source>Download canceled: {0}</source> <translation>Descarga cancelada: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="270"/> + <location filename="Helpviewer/DownloadDialog.py" line="269"/> <source>Error opening save file: {0}</source> <translation>Error al abrir el fichero a guardar: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="277"/> + <location filename="Helpviewer/DownloadDialog.py" line="276"/> <source>Error saving: {0}</source> <translation>Error al guardar: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="294"/> + <location filename="Helpviewer/DownloadDialog.py" line="293"/> <source>Network Error: {0}</source> <translation>Error de Red: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <location filename="Helpviewer/DownloadDialog.py" line="349"/> <source>- {0}:{1:02} minutes remaining</source> <translation>-{0}:{1:02} minutos restantes</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="357"/> + <location filename="Helpviewer/DownloadDialog.py" line="356"/> <source>- {0} seconds remaining</source> <translation>- {0} seconds restantes</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="359"/> + <location filename="Helpviewer/DownloadDialog.py" line="358"/> <source>{0} of {1} ({2}/sec) {3}</source> <translation>{0} de {1} ({2}/segundo) {3}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="368"/> + <location filename="Helpviewer/DownloadDialog.py" line="367"/> <source>{0} downloaded</source> <translation>{0} descargado</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="371"/> + <location filename="Helpviewer/DownloadDialog.py" line="370"/> <source>{0} of {1} - Stopped</source> <translation>{0} de {1} - Parado</translation> </message> @@ -10940,6 +10940,31 @@ </message> </context> <context> + <name>FtpReply</name> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="274"/> + <source> <p><a class="link_parent" href="{0}">Change to parent directory</a></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="287"/> + <source> <tr><th align="left">Name</th><th>Size</th><th align="left">Last modified</th></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="313"/> + <source>{0} {1}</source> + <comment>size unit</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="337"/> + <source>Listing of {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GotoDialog</name> <message> <location filename="QScintilla/GotoDialog.ui" line="13"/> @@ -11103,17 +11128,17 @@ <translation>Inspector Web...</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation>Compruebe que la dirección no tenga errores como <b>ww</b>.ejemplo.org en lugar de <b>www</b>.ejemplo.org</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If the address is correct, try checking the network connection.</source> <translation>Si la dirección es correcta, intente comprobar la conexión de red.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation>Si el ordenador o la red están protegidos por un firewall o un proxy, asegúrese de que al navegador se le permite acceder a la red.</translation> </message> @@ -11188,12 +11213,12 @@ <translation><p>No se pudo ejecutar una aplicación para la URL <b>{0}</b>.</p></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="945"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="947"/> <source>Error loading page: {0}</source> <translation>Error al cargar la página: {0}</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>When connecting to: {0}.</source> <translation>Al conectar con: {0}.</translation> </message> @@ -20777,52 +20802,52 @@ <translation type="obsolete">Se ha activado el uso de proxy pero no hay configurado ningún host proxy.</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source>SSL Errors</source> <translation>Errores de SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source>Certificates</source> <translation>Certificados</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="159"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="161"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Introduzca nombre de usuario y contraseña para '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="162"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="164"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Introduzca nombre de usuario y contraseña para '{0}', reino {1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="189"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="191"/> <source><b>Connect to proxy '{0}' using:</b></source> <translation><b>Conectar al proxy '{0}' utilizando:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>Errores de SSL para <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>¿Desea ignorar estos errores?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Certificados:<br/>{0}<br/>¿Desea aceptar todos estos certificados?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="281"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="283"/> <source><br/>Issuer: {0}</source> <translation><br/>Emisor: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>No válido antes de: {0}<br/>Válido Hasta: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="291"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="293"/> <source><br/>Alternate Names:<ul><li>{0}</li></ul></source> <translation><br/>Nombres alternativos:<ul><li>{0}</li></ul></translation> </message>
--- a/i18n/eric5_fr.ts Sun May 23 15:09:37 2010 +0200 +++ b/i18n/eric5_fr.ts Mon May 24 18:38:54 2010 +0200 @@ -5734,7 +5734,7 @@ <translation>Stop</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="146"/> + <location filename="Helpviewer/DownloadDialog.py" line="145"/> <source>Save File</source> <translation>Enregistrer le fichier</translation> </message> @@ -5774,7 +5774,7 @@ <translation type="obsolete">%1 sur %2 (%3/sec) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="360"/> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>?</source> <translation>?</translation> </message> @@ -5789,22 +5789,22 @@ <translation type="obsolete">%1 sur %2 - Stoppé</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="385"/> + <location filename="Helpviewer/DownloadDialog.py" line="384"/> <source>bytes</source> <translation>octets</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="388"/> + <location filename="Helpviewer/DownloadDialog.py" line="387"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="391"/> + <location filename="Helpviewer/DownloadDialog.py" line="390"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source>Downloading</source> <translation type="unfinished"></translation> </message> @@ -5814,52 +5814,52 @@ <translation type="unfinished">Téléchargement Eric4 {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="157"/> + <location filename="Helpviewer/DownloadDialog.py" line="156"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="270"/> + <location filename="Helpviewer/DownloadDialog.py" line="269"/> <source>Error opening save file: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="277"/> + <location filename="Helpviewer/DownloadDialog.py" line="276"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="294"/> + <location filename="Helpviewer/DownloadDialog.py" line="293"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <location filename="Helpviewer/DownloadDialog.py" line="349"/> <source>- {0}:{1:02} minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="357"/> + <location filename="Helpviewer/DownloadDialog.py" line="356"/> <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="359"/> + <location filename="Helpviewer/DownloadDialog.py" line="358"/> <source>{0} of {1} ({2}/sec) {3}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="368"/> + <location filename="Helpviewer/DownloadDialog.py" line="367"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="371"/> + <location filename="Helpviewer/DownloadDialog.py" line="370"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> @@ -11939,6 +11939,31 @@ </message> </context> <context> + <name>FtpReply</name> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="274"/> + <source> <p><a class="link_parent" href="{0}">Change to parent directory</a></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="287"/> + <source> <tr><th align="left">Name</th><th>Size</th><th align="left">Last modified</th></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="313"/> + <source>{0} {1}</source> + <comment>size unit</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="337"/> + <source>Listing of {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GotoDialog</name> <message> <location filename="QScintilla/GotoDialog.ui" line="13"/> @@ -12122,17 +12147,17 @@ <translation type="obsolete"><html><head><title>Fenêtre d'aide</title></head><body><p>Impossible de charger l'URL demandée <b>%1</b></p><p>Raison: %2</p></body></html></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If the address is correct, try checking the network connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation type="unfinished"></translation> </message> @@ -12207,12 +12232,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="945"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="947"/> <source>Error loading page: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>When connecting to: {0}.</source> <translation type="unfinished"></translation> </message> @@ -22437,52 +22462,52 @@ <translation type="obsolete"><b>Connexion au proxy '%1' en utilisant:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source>SSL Errors</source> <translation type="unfinished">Erreurs SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="159"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="161"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="162"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="164"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="189"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="191"/> <source><b>Connect to proxy '{0}' using:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="281"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="283"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="291"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="293"/> <source><br/>Alternate Names:<ul><li>{0}</li></ul></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sun May 23 15:09:37 2010 +0200 +++ b/i18n/eric5_it.ts Mon May 24 18:38:54 2010 +0200 @@ -5626,7 +5626,7 @@ <translation>Ferma</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="146"/> + <location filename="Helpviewer/DownloadDialog.py" line="145"/> <source>Save File</source> <translation>Salva file</translation> </message> @@ -5666,7 +5666,7 @@ <translation type="obsolete">%1 of %2 (%3/sec) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="360"/> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>?</source> <translation>?</translation> </message> @@ -5681,22 +5681,22 @@ <translation type="obsolete">%1 di %2 - Fermati</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="385"/> + <location filename="Helpviewer/DownloadDialog.py" line="384"/> <source>bytes</source> <translation>bytes</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="388"/> + <location filename="Helpviewer/DownloadDialog.py" line="387"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="391"/> + <location filename="Helpviewer/DownloadDialog.py" line="390"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source>Downloading</source> <translation>Scaricamento</translation> </message> @@ -5711,52 +5711,52 @@ <translation type="unfinished">Download Eric4 {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="157"/> + <location filename="Helpviewer/DownloadDialog.py" line="156"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="270"/> + <location filename="Helpviewer/DownloadDialog.py" line="269"/> <source>Error opening save file: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="277"/> + <location filename="Helpviewer/DownloadDialog.py" line="276"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="294"/> + <location filename="Helpviewer/DownloadDialog.py" line="293"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <location filename="Helpviewer/DownloadDialog.py" line="349"/> <source>- {0}:{1:02} minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="357"/> + <location filename="Helpviewer/DownloadDialog.py" line="356"/> <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="359"/> + <location filename="Helpviewer/DownloadDialog.py" line="358"/> <source>{0} of {1} ({2}/sec) {3}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="368"/> + <location filename="Helpviewer/DownloadDialog.py" line="367"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="371"/> + <location filename="Helpviewer/DownloadDialog.py" line="370"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> @@ -11832,6 +11832,31 @@ </message> </context> <context> + <name>FtpReply</name> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="274"/> + <source> <p><a class="link_parent" href="{0}">Change to parent directory</a></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="287"/> + <source> <tr><th align="left">Name</th><th>Size</th><th align="left">Last modified</th></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="313"/> + <source>{0} {1}</source> + <comment>size unit</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="337"/> + <source>Listing of {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GotoDialog</name> <message> <location filename="QScintilla/GotoDialog.ui" line="13"/> @@ -12015,17 +12040,17 @@ <translation type="obsolete">Nella connessione a: %1.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation>Controlla l'indirizzo per errori tipo <b>ww</b>.example.org invece di <b>www</b>.example.org</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If the address is correct, try checking the network connection.</source> <translation>Se l'indirizzo è corretto, prova a controllare la connessione di rete.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation>Se il tuo computer o la rete sono protetti da un firewall o un proxy, assicurati che il browser possa accedere alla rete.</translation> </message> @@ -12105,12 +12130,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="945"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="947"/> <source>Error loading page: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>When connecting to: {0}.</source> <translation type="unfinished"></translation> </message> @@ -22108,7 +22133,7 @@ <translation type="obsolete"><b>Connetti al proxy '%1' usando:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source>SSL Errors</source> <translation>Errori SSL</translation> </message> @@ -22118,7 +22143,7 @@ <translation type="obsolete"><p>Errori SSL per <br /><b>%1</b><ul><li>%2</li></ul></p><p>Vuoi ignorarli ?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source>Certificates</source> <translation>Certificati</translation> </message> @@ -22148,42 +22173,42 @@ <translation type="obsolete"><br/>Nomi Alternativi:<ul><li>%1</li></ul></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="159"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="161"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="162"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="164"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="189"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="191"/> <source><b>Connect to proxy '{0}' using:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="281"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="283"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="291"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="293"/> <source><br/>Alternate Names:<ul><li>{0}</li></ul></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Sun May 23 15:09:37 2010 +0200 +++ b/i18n/eric5_ru.ts Mon May 24 18:38:54 2010 +0200 @@ -5424,27 +5424,27 @@ <translation>Стоп</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="146"/> + <location filename="Helpviewer/DownloadDialog.py" line="145"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="157"/> + <location filename="Helpviewer/DownloadDialog.py" line="156"/> <source>Download canceled: {0}</source> <translation type="unfinished">Скачивание прервано: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="270"/> + <location filename="Helpviewer/DownloadDialog.py" line="269"/> <source>Error opening save file: {0}</source> <translation type="unfinished">Ошибка сохранения файла: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="277"/> + <location filename="Helpviewer/DownloadDialog.py" line="276"/> <source>Error saving: {0}</source> <translation type="unfinished">Ошибка при сохранении: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="294"/> + <location filename="Helpviewer/DownloadDialog.py" line="293"/> <source>Network Error: {0}</source> <translation type="unfinished">Сетевая ошибка: {0}</translation> </message> @@ -5459,47 +5459,47 @@ <translation type="obsolete">осталось {3} секунд</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="359"/> + <location filename="Helpviewer/DownloadDialog.py" line="358"/> <source>{0} of {1} ({2}/sec) {3}</source> <translation type="unfinished">{0} из {1} ({2}/сек) {3}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="360"/> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>?</source> <translation></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="368"/> + <location filename="Helpviewer/DownloadDialog.py" line="367"/> <source>{0} downloaded</source> <translation type="unfinished">{0} скачено</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="371"/> + <location filename="Helpviewer/DownloadDialog.py" line="370"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished">{0} из {1} - остановлено</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="385"/> + <location filename="Helpviewer/DownloadDialog.py" line="384"/> <source>bytes</source> <translation>байты</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="388"/> + <location filename="Helpviewer/DownloadDialog.py" line="387"/> <source>kB</source> <translation></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="391"/> + <location filename="Helpviewer/DownloadDialog.py" line="390"/> <source>MB</source> <translation></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source>Downloading</source> <translation>Скачивание</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"><p>Начинается загрузка файла <b>{0}</b>.</p><p>Что Вы хотите с ним сделать?</p></translation> </message> @@ -5509,12 +5509,12 @@ <translation>Скачивание Eric5</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <location filename="Helpviewer/DownloadDialog.py" line="349"/> <source>- {0}:{1:02} minutes remaining</source> <translation>осталось {0}:{1:02} минут</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="357"/> + <location filename="Helpviewer/DownloadDialog.py" line="356"/> <source>- {0} seconds remaining</source> <translation>осталось {0} секунд</translation> </message> @@ -11447,6 +11447,31 @@ </message> </context> <context> + <name>FtpReply</name> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="274"/> + <source> <p><a class="link_parent" href="{0}">Change to parent directory</a></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="287"/> + <source> <tr><th align="left">Name</th><th>Size</th><th align="left">Last modified</th></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="313"/> + <source>{0} {1}</source> + <comment>size unit</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="337"/> + <source>Listing of {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GotoDialog</name> <message> <location filename="QScintilla/GotoDialog.ui" line="13"/> @@ -11620,27 +11645,27 @@ <translation>WEB проводник...</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="945"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="947"/> <source>Error loading page: {0}</source> <translation type="unfinished">Ошибка при загрузке страницы: {0}</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>When connecting to: {0}.</source> <translation type="unfinished">При соединении с {0}.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation>Проверьте адрес на ошибки типа <b>ww</b>.example.org вместо <b>www</b>.example.org</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If the address is correct, try checking the network connection.</source> <translation>Если адрес правильный, проверьте сетевое соединение.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation>Если ваш компьютер или локальная сеть находятся за firewall или proxy, убедитесь что браузеру разрешено подсоединяться к сети.</translation> </message> @@ -21657,47 +21682,47 @@ <translation type="obsolete">Активирована работа через прокси, но не настроен ни один прокси-сервер.</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="159"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="161"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"><b>Введите имя пользователя и пароль для '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="162"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="164"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"><b>Введите имя пользователя и пароль для '{0}'; realm '{1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="189"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="191"/> <source><b>Connect to proxy '{0}' using:</b></source> <translation type="unfinished"><b>Подключиться к прокси '{0}' используя:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source>SSL Errors</source> <translation>Ошибки SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"><p>Ошибки SSL для <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Игнорировать?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source>Certificates</source> <translation>Сертификаты</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"><p>Сертификаты:<br/>{0}<br/>Принять?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="281"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="283"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"><br/>эмитент: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"><br/>Не действительны ранее: {0}<br/>Действительны до: {1}</translation> </message> @@ -21707,7 +21732,7 @@ <translation type="obsolete"><br/>Альтернативные имеа::<ul><li>{0}</li><</ul></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="291"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="293"/> <source><br/>Alternate Names:<ul><li>{0}</li></ul></source> <translation type="unfinished"><br/>Альтернативные имеа::<ul><li>{0}</li></ul></translation> </message>
--- a/i18n/eric5_tr.ts Sun May 23 15:09:37 2010 +0200 +++ b/i18n/eric5_tr.ts Mon May 24 18:38:54 2010 +0200 @@ -5694,7 +5694,7 @@ <translation>Dur</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="146"/> + <location filename="Helpviewer/DownloadDialog.py" line="145"/> <source>Save File</source> <translation>Dosyayı Kaydet</translation> </message> @@ -5734,7 +5734,7 @@ <translation type="obsolete">%1 of %2 (%3/sn) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="360"/> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>?</source> <translation>?</translation> </message> @@ -5749,22 +5749,22 @@ <translation type="obsolete">%1 of %2 - Durdu</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="385"/> + <location filename="Helpviewer/DownloadDialog.py" line="384"/> <source>bytes</source> <translation>bitler</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="388"/> + <location filename="Helpviewer/DownloadDialog.py" line="387"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="391"/> + <location filename="Helpviewer/DownloadDialog.py" line="390"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source>Downloading</source> <translation type="unfinished"></translation> </message> @@ -5774,52 +5774,52 @@ <translation type="unfinished">Eric4 İndirme {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="157"/> + <location filename="Helpviewer/DownloadDialog.py" line="156"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="270"/> + <location filename="Helpviewer/DownloadDialog.py" line="269"/> <source>Error opening save file: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="277"/> + <location filename="Helpviewer/DownloadDialog.py" line="276"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="294"/> + <location filename="Helpviewer/DownloadDialog.py" line="293"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <location filename="Helpviewer/DownloadDialog.py" line="349"/> <source>- {0}:{1:02} minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="357"/> + <location filename="Helpviewer/DownloadDialog.py" line="356"/> <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="359"/> + <location filename="Helpviewer/DownloadDialog.py" line="358"/> <source>{0} of {1} ({2}/sec) {3}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="368"/> + <location filename="Helpviewer/DownloadDialog.py" line="367"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="371"/> + <location filename="Helpviewer/DownloadDialog.py" line="370"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> @@ -11856,6 +11856,31 @@ </message> </context> <context> + <name>FtpReply</name> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="274"/> + <source> <p><a class="link_parent" href="{0}">Change to parent directory</a></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="287"/> + <source> <tr><th align="left">Name</th><th>Size</th><th align="left">Last modified</th></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="313"/> + <source>{0} {1}</source> + <comment>size unit</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="337"/> + <source>Listing of {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GotoDialog</name> <message> <location filename="QScintilla/GotoDialog.ui" line="13"/> @@ -12049,17 +12074,17 @@ <translation type="obsolete"><html><head><title>Yardım Penceresi</title></head><body><p>Talep edilen URL <b>%1</b> adresi yüklenemedi.</p><p>Sebep: %2</p></body></html></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If the address is correct, try checking the network connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation type="unfinished"></translation> </message> @@ -12134,12 +12159,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="945"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="947"/> <source>Error loading page: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>When connecting to: {0}.</source> <translation type="unfinished"></translation> </message> @@ -22339,52 +22364,52 @@ <translation type="obsolete"><b> '%1' proxy'sini kullanarak bağlan:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source>SSL Errors</source> <translation type="unfinished">SSL Hataları</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="159"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="161"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="162"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="164"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="189"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="191"/> <source><b>Connect to proxy '{0}' using:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="281"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="283"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="291"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="293"/> <source><br/>Alternate Names:<ul><li>{0}</li></ul></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sun May 23 15:09:37 2010 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Mon May 24 18:38:54 2010 +0200 @@ -5728,7 +5728,7 @@ <translation>中止</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="146"/> + <location filename="Helpviewer/DownloadDialog.py" line="145"/> <source>Save File</source> <translation>保存文件</translation> </message> @@ -5768,7 +5768,7 @@ <translation type="obsolete">%2 (%3/秒) %4 的 %1</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="360"/> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>?</source> <translation>?</translation> </message> @@ -5783,22 +5783,22 @@ <translation type="obsolete">%2 的 %1 - 已中止</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="385"/> + <location filename="Helpviewer/DownloadDialog.py" line="384"/> <source>bytes</source> <translation>字节</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="388"/> + <location filename="Helpviewer/DownloadDialog.py" line="387"/> <source>kB</source> <translation>千字节</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="391"/> + <location filename="Helpviewer/DownloadDialog.py" line="390"/> <source>MB</source> <translation>兆字节</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source>Downloading</source> <translation type="unfinished"></translation> </message> @@ -5808,52 +5808,52 @@ <translation type="unfinished">Eric4 下载 {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="128"/> + <location filename="Helpviewer/DownloadDialog.py" line="127"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="157"/> + <location filename="Helpviewer/DownloadDialog.py" line="156"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="270"/> + <location filename="Helpviewer/DownloadDialog.py" line="269"/> <source>Error opening save file: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="277"/> + <location filename="Helpviewer/DownloadDialog.py" line="276"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="294"/> + <location filename="Helpviewer/DownloadDialog.py" line="293"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <location filename="Helpviewer/DownloadDialog.py" line="349"/> <source>- {0}:{1:02} minutes remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="357"/> + <location filename="Helpviewer/DownloadDialog.py" line="356"/> <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="359"/> + <location filename="Helpviewer/DownloadDialog.py" line="358"/> <source>{0} of {1} ({2}/sec) {3}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="368"/> + <location filename="Helpviewer/DownloadDialog.py" line="367"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="371"/> + <location filename="Helpviewer/DownloadDialog.py" line="370"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> @@ -11896,6 +11896,31 @@ </message> </context> <context> + <name>FtpReply</name> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="274"/> + <source> <p><a class="link_parent" href="{0}">Change to parent directory</a></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="287"/> + <source> <tr><th align="left">Name</th><th>Size</th><th align="left">Last modified</th></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="313"/> + <source>{0} {1}</source> + <comment>size unit</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Network/FtpReply.py" line="337"/> + <source>Listing of {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GotoDialog</name> <message> <location filename="QScintilla/GotoDialog.ui" line="13"/> @@ -12089,17 +12114,17 @@ <translation type="obsolete"><html><head><title>帮助窗口</title></head><body><p>请求的 URL <b>%1</b> 无法载入。</p><p>原因： %2</p></body></html></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If the address is correct, try checking the network connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation type="unfinished"></translation> </message> @@ -12174,12 +12199,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="945"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="947"/> <source>Error loading page: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="954"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="956"/> <source>When connecting to: {0}.</source> <translation type="unfinished"></translation> </message> @@ -22415,52 +22440,52 @@ <translation type="obsolete"><b>连接到代理 '%1' ，使用：</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source>SSL Errors</source> <translation type="unfinished">SSL 错误</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="159"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="161"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="162"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="164"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="189"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="191"/> <source><b>Connect to proxy '{0}' using:</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="228"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="242"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="244"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="281"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="283"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="291"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="293"/> <source><br/>Alternate Names:<ul><li>{0}</li></ul></source> <translation type="unfinished"></translation> </message>
