Mercurial Repositories > eric / changeset
changeset
Finished reworking the cookies dialog of the new web browser.
Tue, 12 Jul 2016 12:48:11 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 12 Jul 2016 12:48:11 +0200
- changeset 5030
- b728bb00886e
- parent 5029
- 1ce5e98ebc43
- child 5031
- e4dbcb22d912
Finished reworking the cookies dialog of the new web browser.
--- a/APIs/Python3/eric6.api Sun Jul 10 19:41:24 2016 +0200 +++ b/APIs/Python3/eric6.api Tue Jul 12 12:48:11 2016 +0200 @@ -9874,8 +9874,6 @@ eric6.WebBrowser.ClosedTabsManager.ClosedTabsManager.isClosedTabAvailable?4() eric6.WebBrowser.ClosedTabsManager.ClosedTabsManager.recordBrowser?4(browser, position) eric6.WebBrowser.ClosedTabsManager.ClosedTabsManager?1(parent=None) -eric6.WebBrowser.CookieJar.CookieDetailsDialog.CookieDetailsDialog.setData?4(domain, name, path, secure, expires, value) -eric6.WebBrowser.CookieJar.CookieDetailsDialog.CookieDetailsDialog?1(parent=None) eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.addRule?4(host, rule) eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.columnCount?4(parent=QModelIndex()) eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.data?4(index, role) @@ -9899,10 +9897,12 @@ eric6.WebBrowser.CookieJar.CookieJar.CookieJar.blockedCookies?4() eric6.WebBrowser.CookieJar.CookieJar.CookieJar.clear?4() eric6.WebBrowser.CookieJar.CookieJar.CookieJar.close?4() +eric6.WebBrowser.CookieJar.CookieJar.CookieJar.cookieDomains?4() eric6.WebBrowser.CookieJar.CookieJar.CookieJar.cookies?4() eric6.WebBrowser.CookieJar.CookieJar.CookieJar.cookiesChanged?7 eric6.WebBrowser.CookieJar.CookieJar.CookieJar.filterTrackingCookies?4() eric6.WebBrowser.CookieJar.CookieJar.CookieJar.keepPolicy?4() +eric6.WebBrowser.CookieJar.CookieJar.CookieJar.removeCookie?4(cookie) eric6.WebBrowser.CookieJar.CookieJar.CookieJar.removeCookies?4(cookies) eric6.WebBrowser.CookieJar.CookieJar.CookieJar.setAcceptPolicy?4(policy) eric6.WebBrowser.CookieJar.CookieJar.CookieJar.setAllowForSessionCookies?4(list_) @@ -9911,17 +9911,17 @@ eric6.WebBrowser.CookieJar.CookieJar.CookieJar.setFilterTrackingCookies?4(filterTrackingCookies) eric6.WebBrowser.CookieJar.CookieJar.CookieJar.setKeepPolicy?4(policy) eric6.WebBrowser.CookieJar.CookieJar.CookieJar?1(parent=None) -eric6.WebBrowser.CookieJar.CookieModel.CookieModel.columnCount?4(parent=QModelIndex()) -eric6.WebBrowser.CookieJar.CookieModel.CookieModel.data?4(index, role) -eric6.WebBrowser.CookieJar.CookieModel.CookieModel.headerData?4(section, orientation, role) -eric6.WebBrowser.CookieJar.CookieModel.CookieModel.removeRows?4(row, count, parent=QModelIndex()) -eric6.WebBrowser.CookieJar.CookieModel.CookieModel.rowCount?4(parent=QModelIndex()) -eric6.WebBrowser.CookieJar.CookieModel.CookieModel?1(cookieJar, parent=None) eric6.WebBrowser.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog.accept?4() eric6.WebBrowser.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog.on_cookiesButton_clicked?4() eric6.WebBrowser.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog.on_exceptionsButton_clicked?4() eric6.WebBrowser.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog?1(parent) +eric6.WebBrowser.CookieJar.CookiesDialog.CookiesDialog.CookieRole?7 +eric6.WebBrowser.CookieJar.CookiesDialog.CookiesDialog.DomainRole?7 eric6.WebBrowser.CookieJar.CookiesDialog.CookiesDialog.on_addButton_clicked?4() +eric6.WebBrowser.CookieJar.CookiesDialog.CookiesDialog.on_cookiesTree_currentItemChanged?4(current, previous) +eric6.WebBrowser.CookieJar.CookiesDialog.CookiesDialog.on_removeAllButton_clicked?4() +eric6.WebBrowser.CookieJar.CookiesDialog.CookiesDialog.on_removeButton_clicked?4() +eric6.WebBrowser.CookieJar.CookiesDialog.CookiesDialog.on_searchEdit_textChanged?4(txt) eric6.WebBrowser.CookieJar.CookiesDialog.CookiesDialog?1(cookieJar, parent=None) eric6.WebBrowser.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog.on_allowButton_clicked?4() eric6.WebBrowser.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog.on_allowForSessionButton_clicked?4()
--- a/Documentation/Help/source.qhp Sun Jul 10 19:41:24 2016 +0200 +++ b/Documentation/Help/source.qhp Tue Jul 12 12:48:11 2016 +0200 @@ -1105,10 +1105,8 @@ <section title="eric6.WebBrowser.Bookmarks.XbelWriter" ref="eric6.WebBrowser.Bookmarks.XbelWriter.html" /> </section> <section title="eric6.WebBrowser.CookieJar" ref="index-eric6.WebBrowser.CookieJar.html"> - <section title="eric6.WebBrowser.CookieJar.CookieDetailsDialog" ref="eric6.WebBrowser.CookieJar.CookieDetailsDialog.html" /> <section title="eric6.WebBrowser.CookieJar.CookieExceptionsModel" ref="eric6.WebBrowser.CookieJar.CookieExceptionsModel.html" /> <section title="eric6.WebBrowser.CookieJar.CookieJar" ref="eric6.WebBrowser.CookieJar.CookieJar.html" /> - <section title="eric6.WebBrowser.CookieJar.CookieModel" ref="eric6.WebBrowser.CookieJar.CookieModel.html" /> <section title="eric6.WebBrowser.CookieJar.CookiesConfigurationDialog" ref="eric6.WebBrowser.CookieJar.CookiesConfigurationDialog.html" /> <section title="eric6.WebBrowser.CookieJar.CookiesDialog" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html" /> <section title="eric6.WebBrowser.CookieJar.CookiesExceptionsDialog" ref="eric6.WebBrowser.CookieJar.CookiesExceptionsDialog.html" /> @@ -3083,13 +3081,9 @@ <keyword name="ContentDisposition_1 (Constructor)" id="ContentDisposition_1 (Constructor)" ref="eric6.E5Network.E5RFC6266.html#ContentDisposition_1.__init__" /> <keyword name="ContentDisposition_1.filename" id="ContentDisposition_1.filename" ref="eric6.E5Network.E5RFC6266.html#ContentDisposition_1.filename" /> <keyword name="CookieDetailsDialog" id="CookieDetailsDialog" ref="eric6.Helpviewer.CookieJar.CookieDetailsDialog.html#CookieDetailsDialog" /> - <keyword name="CookieDetailsDialog" id="CookieDetailsDialog" ref="eric6.WebBrowser.CookieJar.CookieDetailsDialog.html#CookieDetailsDialog" /> <keyword name="CookieDetailsDialog (Constructor)" id="CookieDetailsDialog (Constructor)" ref="eric6.Helpviewer.CookieJar.CookieDetailsDialog.html#CookieDetailsDialog.__init__" /> - <keyword name="CookieDetailsDialog (Constructor)" id="CookieDetailsDialog (Constructor)" ref="eric6.WebBrowser.CookieJar.CookieDetailsDialog.html#CookieDetailsDialog.__init__" /> <keyword name="CookieDetailsDialog (Module)" id="CookieDetailsDialog (Module)" ref="eric6.Helpviewer.CookieJar.CookieDetailsDialog.html" /> - <keyword name="CookieDetailsDialog (Module)" id="CookieDetailsDialog (Module)" ref="eric6.WebBrowser.CookieJar.CookieDetailsDialog.html" /> <keyword name="CookieDetailsDialog.setData" id="CookieDetailsDialog.setData" ref="eric6.Helpviewer.CookieJar.CookieDetailsDialog.html#CookieDetailsDialog.setData" /> - <keyword name="CookieDetailsDialog.setData" id="CookieDetailsDialog.setData" ref="eric6.WebBrowser.CookieJar.CookieDetailsDialog.html#CookieDetailsDialog.setData" /> <keyword name="CookieExceptionsModel" id="CookieExceptionsModel" ref="eric6.Helpviewer.CookieJar.CookieExceptionsModel.html#CookieExceptionsModel" /> <keyword name="CookieExceptionsModel" id="CookieExceptionsModel" ref="eric6.WebBrowser.CookieJar.CookieExceptionsModel.html#CookieExceptionsModel" /> <keyword name="CookieExceptionsModel (Constructor)" id="CookieExceptionsModel (Constructor)" ref="eric6.Helpviewer.CookieJar.CookieExceptionsModel.html#CookieExceptionsModel.__init__" /> @@ -3140,6 +3134,7 @@ <keyword name="CookieJar.clear" id="CookieJar.clear" ref="eric6.WebBrowser.CookieJar.CookieJar.html#CookieJar.clear" /> <keyword name="CookieJar.close" id="CookieJar.close" ref="eric6.Helpviewer.CookieJar.CookieJar.html#CookieJar.close" /> <keyword name="CookieJar.close" id="CookieJar.close" ref="eric6.WebBrowser.CookieJar.CookieJar.html#CookieJar.close" /> + <keyword name="CookieJar.cookieDomains" id="CookieJar.cookieDomains" ref="eric6.WebBrowser.CookieJar.CookieJar.html#CookieJar.cookieDomains" /> <keyword name="CookieJar.cookies" id="CookieJar.cookies" ref="eric6.Helpviewer.CookieJar.CookieJar.html#CookieJar.cookies" /> <keyword name="CookieJar.cookies" id="CookieJar.cookies" ref="eric6.WebBrowser.CookieJar.CookieJar.html#CookieJar.cookies" /> <keyword name="CookieJar.cookiesForUrl" id="CookieJar.cookiesForUrl" ref="eric6.Helpviewer.CookieJar.CookieJar.html#CookieJar.cookiesForUrl" /> @@ -3149,6 +3144,7 @@ <keyword name="CookieJar.keepPolicy" id="CookieJar.keepPolicy" ref="eric6.WebBrowser.CookieJar.CookieJar.html#CookieJar.keepPolicy" /> <keyword name="CookieJar.load" id="CookieJar.load" ref="eric6.Helpviewer.CookieJar.CookieJar.html#CookieJar.load" /> <keyword name="CookieJar.loadCookies" id="CookieJar.loadCookies" ref="eric6.Helpviewer.CookieJar.CookieJar.html#CookieJar.loadCookies" /> + <keyword name="CookieJar.removeCookie" id="CookieJar.removeCookie" ref="eric6.WebBrowser.CookieJar.CookieJar.html#CookieJar.removeCookie" /> <keyword name="CookieJar.removeCookies" id="CookieJar.removeCookies" ref="eric6.WebBrowser.CookieJar.CookieJar.html#CookieJar.removeCookies" /> <keyword name="CookieJar.save" id="CookieJar.save" ref="eric6.Helpviewer.CookieJar.CookieJar.html#CookieJar.save" /> <keyword name="CookieJar.saveCookies" id="CookieJar.saveCookies" ref="eric6.Helpviewer.CookieJar.CookieJar.html#CookieJar.saveCookies" /> @@ -3167,23 +3163,14 @@ <keyword name="CookieJar.setKeepPolicy" id="CookieJar.setKeepPolicy" ref="eric6.Helpviewer.CookieJar.CookieJar.html#CookieJar.setKeepPolicy" /> <keyword name="CookieJar.setKeepPolicy" id="CookieJar.setKeepPolicy" ref="eric6.WebBrowser.CookieJar.CookieJar.html#CookieJar.setKeepPolicy" /> <keyword name="CookieModel" id="CookieModel" ref="eric6.Helpviewer.CookieJar.CookieModel.html#CookieModel" /> - <keyword name="CookieModel" id="CookieModel" ref="eric6.WebBrowser.CookieJar.CookieModel.html#CookieModel" /> <keyword name="CookieModel (Constructor)" id="CookieModel (Constructor)" ref="eric6.Helpviewer.CookieJar.CookieModel.html#CookieModel.__init__" /> - <keyword name="CookieModel (Constructor)" id="CookieModel (Constructor)" ref="eric6.WebBrowser.CookieJar.CookieModel.html#CookieModel.__init__" /> <keyword name="CookieModel (Module)" id="CookieModel (Module)" ref="eric6.Helpviewer.CookieJar.CookieModel.html" /> - <keyword name="CookieModel (Module)" id="CookieModel (Module)" ref="eric6.WebBrowser.CookieJar.CookieModel.html" /> <keyword name="CookieModel.__cookiesChanged" id="CookieModel.__cookiesChanged" ref="eric6.Helpviewer.CookieJar.CookieModel.html#CookieModel.__cookiesChanged" /> - <keyword name="CookieModel.__cookiesChanged" id="CookieModel.__cookiesChanged" ref="eric6.WebBrowser.CookieJar.CookieModel.html#CookieModel.__cookiesChanged" /> <keyword name="CookieModel.columnCount" id="CookieModel.columnCount" ref="eric6.Helpviewer.CookieJar.CookieModel.html#CookieModel.columnCount" /> - <keyword name="CookieModel.columnCount" id="CookieModel.columnCount" ref="eric6.WebBrowser.CookieJar.CookieModel.html#CookieModel.columnCount" /> <keyword name="CookieModel.data" id="CookieModel.data" ref="eric6.Helpviewer.CookieJar.CookieModel.html#CookieModel.data" /> - <keyword name="CookieModel.data" id="CookieModel.data" ref="eric6.WebBrowser.CookieJar.CookieModel.html#CookieModel.data" /> <keyword name="CookieModel.headerData" id="CookieModel.headerData" ref="eric6.Helpviewer.CookieJar.CookieModel.html#CookieModel.headerData" /> - <keyword name="CookieModel.headerData" id="CookieModel.headerData" ref="eric6.WebBrowser.CookieJar.CookieModel.html#CookieModel.headerData" /> <keyword name="CookieModel.removeRows" id="CookieModel.removeRows" ref="eric6.Helpviewer.CookieJar.CookieModel.html#CookieModel.removeRows" /> - <keyword name="CookieModel.removeRows" id="CookieModel.removeRows" ref="eric6.WebBrowser.CookieJar.CookieModel.html#CookieModel.removeRows" /> <keyword name="CookieModel.rowCount" id="CookieModel.rowCount" ref="eric6.Helpviewer.CookieJar.CookieModel.html#CookieModel.rowCount" /> - <keyword name="CookieModel.rowCount" id="CookieModel.rowCount" ref="eric6.WebBrowser.CookieJar.CookieModel.html#CookieModel.rowCount" /> <keyword name="CookiesConfigurationDialog" id="CookiesConfigurationDialog" ref="eric6.Helpviewer.CookieJar.CookiesConfigurationDialog.html#CookiesConfigurationDialog" /> <keyword name="CookiesConfigurationDialog" id="CookiesConfigurationDialog" ref="eric6.WebBrowser.CookieJar.CookiesConfigurationDialog.html#CookiesConfigurationDialog" /> <keyword name="CookiesConfigurationDialog (Constructor)" id="CookiesConfigurationDialog (Constructor)" ref="eric6.Helpviewer.CookieJar.CookiesConfigurationDialog.html#CookiesConfigurationDialog.__init__" /> @@ -3202,14 +3189,17 @@ <keyword name="CookiesDialog (Constructor)" id="CookiesDialog (Constructor)" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__init__" /> <keyword name="CookiesDialog (Module)" id="CookiesDialog (Module)" ref="eric6.Helpviewer.CookieJar.CookiesDialog.html" /> <keyword name="CookiesDialog (Module)" id="CookiesDialog (Module)" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html" /> + <keyword name="CookiesDialog.__addCookie" id="CookiesDialog.__addCookie" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__addCookie" /> + <keyword name="CookiesDialog.__cookieDomain" id="CookiesDialog.__cookieDomain" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__cookieDomain" /> <keyword name="CookiesDialog.__showCookieDetails" id="CookiesDialog.__showCookieDetails" ref="eric6.Helpviewer.CookieJar.CookiesDialog.html#CookiesDialog.__showCookieDetails" /> - <keyword name="CookiesDialog.__showCookieDetails" id="CookiesDialog.__showCookieDetails" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__showCookieDetails" /> <keyword name="CookiesDialog.__tableModelReset" id="CookiesDialog.__tableModelReset" ref="eric6.Helpviewer.CookieJar.CookiesDialog.html#CookiesDialog.__tableModelReset" /> - <keyword name="CookiesDialog.__tableModelReset" id="CookiesDialog.__tableModelReset" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__tableModelReset" /> <keyword name="CookiesDialog.__tableSelectionChanged" id="CookiesDialog.__tableSelectionChanged" ref="eric6.Helpviewer.CookieJar.CookiesDialog.html#CookiesDialog.__tableSelectionChanged" /> - <keyword name="CookiesDialog.__tableSelectionChanged" id="CookiesDialog.__tableSelectionChanged" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.__tableSelectionChanged" /> <keyword name="CookiesDialog.on_addButton_clicked" id="CookiesDialog.on_addButton_clicked" ref="eric6.Helpviewer.CookieJar.CookiesDialog.html#CookiesDialog.on_addButton_clicked" /> <keyword name="CookiesDialog.on_addButton_clicked" id="CookiesDialog.on_addButton_clicked" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.on_addButton_clicked" /> + <keyword name="CookiesDialog.on_cookiesTree_currentItemChanged" id="CookiesDialog.on_cookiesTree_currentItemChanged" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.on_cookiesTree_currentItemChanged" /> + <keyword name="CookiesDialog.on_removeAllButton_clicked" id="CookiesDialog.on_removeAllButton_clicked" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.on_removeAllButton_clicked" /> + <keyword name="CookiesDialog.on_removeButton_clicked" id="CookiesDialog.on_removeButton_clicked" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.on_removeButton_clicked" /> + <keyword name="CookiesDialog.on_searchEdit_textChanged" id="CookiesDialog.on_searchEdit_textChanged" ref="eric6.WebBrowser.CookieJar.CookiesDialog.html#CookiesDialog.on_searchEdit_textChanged" /> <keyword name="CookiesExceptionsDialog" id="CookiesExceptionsDialog" ref="eric6.Helpviewer.CookieJar.CookiesExceptionsDialog.html#CookiesExceptionsDialog" /> <keyword name="CookiesExceptionsDialog" id="CookiesExceptionsDialog" ref="eric6.WebBrowser.CookieJar.CookiesExceptionsDialog.html#CookiesExceptionsDialog" /> <keyword name="CookiesExceptionsDialog (Constructor)" id="CookiesExceptionsDialog (Constructor)" ref="eric6.Helpviewer.CookieJar.CookiesExceptionsDialog.html#CookiesExceptionsDialog.__init__" /> @@ -17615,10 +17605,8 @@ <file>eric6.WebBrowser.Bookmarks.XbelReader.html</file> <file>eric6.WebBrowser.Bookmarks.XbelWriter.html</file> <file>eric6.WebBrowser.ClosedTabsManager.html</file> - <file>eric6.WebBrowser.CookieJar.CookieDetailsDialog.html</file> <file>eric6.WebBrowser.CookieJar.CookieExceptionsModel.html</file> <file>eric6.WebBrowser.CookieJar.CookieJar.html</file> - <file>eric6.WebBrowser.CookieJar.CookieModel.html</file> <file>eric6.WebBrowser.CookieJar.CookiesConfigurationDialog.html</file> <file>eric6.WebBrowser.CookieJar.CookiesDialog.html</file> <file>eric6.WebBrowser.CookieJar.CookiesExceptionsDialog.html</file>
--- a/Documentation/Source/eric6.WebBrowser.CookieJar.CookieDetailsDialog.html Sun Jul 10 19:41:24 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,109 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.WebBrowser.CookieJar.CookieDetailsDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.WebBrowser.CookieJar.CookieDetailsDialog</h1> -<p> -Module implementing a dialog showing the cookie data. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#CookieDetailsDialog">CookieDetailsDialog</a></td> -<td>Class implementing a dialog showing the cookie data.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="CookieDetailsDialog" ID="CookieDetailsDialog"></a> -<h2>CookieDetailsDialog</h2> -<p> - Class implementing a dialog showing the cookie data. -</p> -<h3>Derived from</h3> -QDialog, Ui_CookieDetailsDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#CookieDetailsDialog.__init__">CookieDetailsDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#CookieDetailsDialog.setData">setData</a></td> -<td>Public method to set the data to be shown.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="CookieDetailsDialog.__init__" ID="CookieDetailsDialog.__init__"></a> -<h4>CookieDetailsDialog (Constructor)</h4> -<b>CookieDetailsDialog</b>(<i>parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>parent</i></dt> -<dd> -reference to the parent object (QWidget) -</dd> -</dl><a NAME="CookieDetailsDialog.setData" ID="CookieDetailsDialog.setData"></a> -<h4>CookieDetailsDialog.setData</h4> -<b>setData</b>(<i>domain, name, path, secure, expires, value</i>) -<p> - Public method to set the data to be shown. -</p><dl> -<dt><i>domain</i></dt> -<dd> -domain of the cookie (string) -</dd><dt><i>name</i></dt> -<dd> -name of the cookie (string) -</dd><dt><i>path</i></dt> -<dd> -path of the cookie (string) -</dd><dt><i>secure</i></dt> -<dd> -flag indicating a secure cookie (boolean) -</dd><dt><i>expires</i></dt> -<dd> -expiration time of the cookie (string) -</dd><dt><i>value</i></dt> -<dd> -value of the cookie (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.WebBrowser.CookieJar.CookieJar.html Sun Jul 10 19:41:24 2016 +0200 +++ b/Documentation/Source/eric6.WebBrowser.CookieJar.CookieJar.html Tue Jul 12 12:48:11 2016 +0200 @@ -106,6 +106,9 @@ <td><a href="#CookieJar.close">close</a></td> <td>Public slot to close the cookie jar.</td> </tr><tr> +<td><a href="#CookieJar.cookieDomains">cookieDomains</a></td> +<td>Public method to get a list of all domains used by the cookies.</td> +</tr><tr> <td><a href="#CookieJar.cookies">cookies</a></td> <td>Public method to get the cookies of the cookie jar.</td> </tr><tr> @@ -115,6 +118,9 @@ <td><a href="#CookieJar.keepPolicy">keepPolicy</a></td> <td>Public method to get the keep policy.</td> </tr><tr> +<td><a href="#CookieJar.removeCookie">removeCookie</a></td> +<td>Public method to remove a cookie.</td> +</tr><tr> <td><a href="#CookieJar.removeCookies">removeCookies</a></td> <td>Public method to remove a list of cookies.</td> </tr><tr> @@ -297,7 +303,22 @@ <b>close</b>(<i></i>) <p> Public slot to close the cookie jar. -</p><a NAME="CookieJar.cookies" ID="CookieJar.cookies"></a> +</p><a NAME="CookieJar.cookieDomains" ID="CookieJar.cookieDomains"></a> +<h4>CookieJar.cookieDomains</h4> +<b>cookieDomains</b>(<i></i>) +<p> + Public method to get a list of all domains used by the cookies. +</p><dl> +<dt>Returns:</dt> +<dd> +list of domain names +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl><a NAME="CookieJar.cookies" ID="CookieJar.cookies"></a> <h4>CookieJar.cookies</h4> <b>cookies</b>(<i></i>) <p> @@ -327,6 +348,16 @@ <dd> keep policy </dd> +</dl><a NAME="CookieJar.removeCookie" ID="CookieJar.removeCookie"></a> +<h4>CookieJar.removeCookie</h4> +<b>removeCookie</b>(<i>cookie</i>) +<p> + Public method to remove a cookie. +</p><dl> +<dt><i>cookie</i> (QNetworkCookie)</dt> +<dd> +cookie to be removed +</dd> </dl><a NAME="CookieJar.removeCookies" ID="CookieJar.removeCookies"></a> <h4>CookieJar.removeCookies</h4> <b>removeCookies</b>(<i>cookies</i>)
--- a/Documentation/Source/eric6.WebBrowser.CookieJar.CookieModel.html Sun Jul 10 19:41:24 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,197 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.WebBrowser.CookieJar.CookieModel</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.WebBrowser.CookieJar.CookieModel</h1> -<p> -Module implementing the cookie model. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#CookieModel">CookieModel</a></td> -<td>Class implementing the cookie model.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="CookieModel" ID="CookieModel"></a> -<h2>CookieModel</h2> -<p> - Class implementing the cookie model. -</p> -<h3>Derived from</h3> -QAbstractTableModel -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#CookieModel.__init__">CookieModel</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#CookieModel.__cookiesChanged">__cookiesChanged</a></td> -<td>Private slot handling changes of the cookies list in the cookie jar.</td> -</tr><tr> -<td><a href="#CookieModel.columnCount">columnCount</a></td> -<td>Public method to get the number of columns of the model.</td> -</tr><tr> -<td><a href="#CookieModel.data">data</a></td> -<td>Public method to get data from the model.</td> -</tr><tr> -<td><a href="#CookieModel.headerData">headerData</a></td> -<td>Public method to get header data from the model.</td> -</tr><tr> -<td><a href="#CookieModel.removeRows">removeRows</a></td> -<td>Public method to remove entries from the model.</td> -</tr><tr> -<td><a href="#CookieModel.rowCount">rowCount</a></td> -<td>Public method to get the number of rows of the model.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="CookieModel.__init__" ID="CookieModel.__init__"></a> -<h4>CookieModel (Constructor)</h4> -<b>CookieModel</b>(<i>cookieJar, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>cookieJar</i></dt> -<dd> -reference to the cookie jar (CookieJar) -</dd><dt><i>parent</i></dt> -<dd> -reference to the parent object (QObject) -</dd> -</dl><a NAME="CookieModel.__cookiesChanged" ID="CookieModel.__cookiesChanged"></a> -<h4>CookieModel.__cookiesChanged</h4> -<b>__cookiesChanged</b>(<i></i>) -<p> - Private slot handling changes of the cookies list in the cookie jar. -</p><a NAME="CookieModel.columnCount" ID="CookieModel.columnCount"></a> -<h4>CookieModel.columnCount</h4> -<b>columnCount</b>(<i>parent=QModelIndex()</i>) -<p> - Public method to get the number of columns of the model. -</p><dl> -<dt><i>parent</i></dt> -<dd> -parent index (QModelIndex) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -number of columns (integer) -</dd> -</dl><a NAME="CookieModel.data" ID="CookieModel.data"></a> -<h4>CookieModel.data</h4> -<b>data</b>(<i>index, role</i>) -<p> - Public method to get data from the model. -</p><dl> -<dt><i>index</i></dt> -<dd> -index to get data for (QModelIndex) -</dd><dt><i>role</i></dt> -<dd> -role of the data to retrieve (integer) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -requested data -</dd> -</dl><a NAME="CookieModel.headerData" ID="CookieModel.headerData"></a> -<h4>CookieModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role</i>) -<p> - Public method to get header data from the model. -</p><dl> -<dt><i>section</i></dt> -<dd> -section number (integer) -</dd><dt><i>orientation</i></dt> -<dd> -orientation (Qt.Orientation) -</dd><dt><i>role</i></dt> -<dd> -role of the data to retrieve (integer) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -requested data -</dd> -</dl><a NAME="CookieModel.removeRows" ID="CookieModel.removeRows"></a> -<h4>CookieModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) -<p> - Public method to remove entries from the model. -</p><dl> -<dt><i>row</i></dt> -<dd> -start row (integer) -</dd><dt><i>count</i></dt> -<dd> -number of rows to remove (integer) -</dd><dt><i>parent</i></dt> -<dd> -parent index (QModelIndex) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -flag indicating success (boolean) -</dd> -</dl><a NAME="CookieModel.rowCount" ID="CookieModel.rowCount"></a> -<h4>CookieModel.rowCount</h4> -<b>rowCount</b>(<i>parent=QModelIndex()</i>) -<p> - Public method to get the number of rows of the model. -</p><dl> -<dt><i>parent</i></dt> -<dd> -parent index (QModelIndex) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -number of columns (integer) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.WebBrowser.CookieJar.CookiesDialog.html Sun Jul 10 19:41:24 2016 +0200 +++ b/Documentation/Source/eric6.WebBrowser.CookieJar.CookiesDialog.html Tue Jul 12 12:48:11 2016 +0200 @@ -48,7 +48,7 @@ QDialog, Ui_CookiesDialog <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>CookieRole</td></tr><tr><td>DomainRole</td></tr> </table> <h3>Class Methods</h3> <table> @@ -60,17 +60,26 @@ <td><a href="#CookiesDialog.__init__">CookiesDialog</a></td> <td>Constructor</td> </tr><tr> -<td><a href="#CookiesDialog.__showCookieDetails">__showCookieDetails</a></td> -<td>Private slot to show a dialog with the cookie details.</td> +<td><a href="#CookiesDialog.__addCookie">__addCookie</a></td> +<td>Private method to add a cookie to the tree.</td> </tr><tr> -<td><a href="#CookiesDialog.__tableModelReset">__tableModelReset</a></td> -<td>Private slot to handle a reset of the cookies table.</td> -</tr><tr> -<td><a href="#CookiesDialog.__tableSelectionChanged">__tableSelectionChanged</a></td> -<td>Private slot to handle a change of selected items.</td> +<td><a href="#CookiesDialog.__cookieDomain">__cookieDomain</a></td> +<td>Private method to extract the cookie domain.</td> </tr><tr> <td><a href="#CookiesDialog.on_addButton_clicked">on_addButton_clicked</a></td> <td>Private slot to add a new exception.</td> +</tr><tr> +<td><a href="#CookiesDialog.on_cookiesTree_currentItemChanged">on_cookiesTree_currentItemChanged</a></td> +<td>Private slot to handle a change of the current item.</td> +</tr><tr> +<td><a href="#CookiesDialog.on_removeAllButton_clicked">on_removeAllButton_clicked</a></td> +<td>Private slot to remove all cookies.</td> +</tr><tr> +<td><a href="#CookiesDialog.on_removeButton_clicked">on_removeButton_clicked</a></td> +<td>Private slot to remove the selected cookie(s).</td> +</tr><tr> +<td><a href="#CookiesDialog.on_searchEdit_textChanged">on_searchEdit_textChanged</a></td> +<td>Private slot to search and filter the cookie tree.</td> </tr> </table> <h3>Static Methods</h3> @@ -90,40 +99,75 @@ <dd> reference to the parent widget (QWidget) </dd> -</dl><a NAME="CookiesDialog.__showCookieDetails" ID="CookiesDialog.__showCookieDetails"></a> -<h4>CookiesDialog.__showCookieDetails</h4> -<b>__showCookieDetails</b>(<i>index</i>) +</dl><a NAME="CookiesDialog.__addCookie" ID="CookiesDialog.__addCookie"></a> +<h4>CookiesDialog.__addCookie</h4> +<b>__addCookie</b>(<i>cookie</i>) <p> - Private slot to show a dialog with the cookie details. + Private method to add a cookie to the tree. </p><dl> -<dt><i>index</i></dt> +<dt><i>cookie</i> (QNetworkCookie)</dt> <dd> -index of the entry to show (QModelIndex) +reference to the cookie </dd> -</dl><a NAME="CookiesDialog.__tableModelReset" ID="CookiesDialog.__tableModelReset"></a> -<h4>CookiesDialog.__tableModelReset</h4> -<b>__tableModelReset</b>(<i></i>) +</dl><a NAME="CookiesDialog.__cookieDomain" ID="CookiesDialog.__cookieDomain"></a> +<h4>CookiesDialog.__cookieDomain</h4> +<b>__cookieDomain</b>(<i>cookie</i>) <p> - Private slot to handle a reset of the cookies table. -</p><a NAME="CookiesDialog.__tableSelectionChanged" ID="CookiesDialog.__tableSelectionChanged"></a> -<h4>CookiesDialog.__tableSelectionChanged</h4> -<b>__tableSelectionChanged</b>(<i>selected, deselected</i>) -<p> - Private slot to handle a change of selected items. + Private method to extract the cookie domain. </p><dl> -<dt><i>selected</i></dt> +<dt><i>cookie</i> (QNetworkCookie)</dt> +<dd> +cookie to get the domain from +</dd> +</dl><dl> +<dt>Returns:</dt> <dd> -selected indexes (QItemSelection) -</dd><dt><i>deselected</i></dt> +domain of the cookie +</dd> +</dl><dl> +<dt>Return Type:</dt> <dd> -deselected indexes (QItemSelection) +str </dd> </dl><a NAME="CookiesDialog.on_addButton_clicked" ID="CookiesDialog.on_addButton_clicked"></a> <h4>CookiesDialog.on_addButton_clicked</h4> <b>on_addButton_clicked</b>(<i></i>) <p> Private slot to add a new exception. -</p> +</p><a NAME="CookiesDialog.on_cookiesTree_currentItemChanged" ID="CookiesDialog.on_cookiesTree_currentItemChanged"></a> +<h4>CookiesDialog.on_cookiesTree_currentItemChanged</h4> +<b>on_cookiesTree_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot to handle a change of the current item. +</p><dl> +<dt><i>current</i> (QTreeWidgetItem)</dt> +<dd> +reference to the current item +</dd><dt><i>previous</i> (QTreeWidgetItem)</dt> +<dd> +reference to the previous current item +</dd> +</dl><a NAME="CookiesDialog.on_removeAllButton_clicked" ID="CookiesDialog.on_removeAllButton_clicked"></a> +<h4>CookiesDialog.on_removeAllButton_clicked</h4> +<b>on_removeAllButton_clicked</b>(<i></i>) +<p> + Private slot to remove all cookies. +</p><a NAME="CookiesDialog.on_removeButton_clicked" ID="CookiesDialog.on_removeButton_clicked"></a> +<h4>CookiesDialog.on_removeButton_clicked</h4> +<b>on_removeButton_clicked</b>(<i></i>) +<p> + Private slot to remove the selected cookie(s). +</p><a NAME="CookiesDialog.on_searchEdit_textChanged" ID="CookiesDialog.on_searchEdit_textChanged"></a> +<h4>CookiesDialog.on_searchEdit_textChanged</h4> +<b>on_searchEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to search and filter the cookie tree. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +text to search for +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.WebBrowser.CookieJar.html Sun Jul 10 19:41:24 2016 +0200 +++ b/Documentation/Source/index-eric6.WebBrowser.CookieJar.html Tue Jul 12 12:48:11 2016 +0200 @@ -28,18 +28,12 @@ <h3>Modules</h3> <table> <tr> -<td><a href="eric6.WebBrowser.CookieJar.CookieDetailsDialog.html">CookieDetailsDialog</a></td> -<td>Module implementing a dialog showing the cookie data.</td> -</tr><tr> <td><a href="eric6.WebBrowser.CookieJar.CookieExceptionsModel.html">CookieExceptionsModel</a></td> <td>Module implementing the cookie exceptions model.</td> </tr><tr> <td><a href="eric6.WebBrowser.CookieJar.CookieJar.html">CookieJar</a></td> <td>Module implementing a QNetworkCookieJar subclass with various accept policies.</td> </tr><tr> -<td><a href="eric6.WebBrowser.CookieJar.CookieModel.html">CookieModel</a></td> -<td>Module implementing the cookie model.</td> -</tr><tr> <td><a href="eric6.WebBrowser.CookieJar.CookiesConfigurationDialog.html">CookiesConfigurationDialog</a></td> <td>Module implementing the cookies configuration dialog.</td> </tr><tr>
--- a/WebBrowser/CookieJar/CookieDetailsDialog.py Sun Jul 10 19:41:24 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2009 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog showing the cookie data. -""" - -from __future__ import unicode_literals - -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QDialog - -from .Ui_CookieDetailsDialog import Ui_CookieDetailsDialog - - -class CookieDetailsDialog(QDialog, Ui_CookieDetailsDialog): - """ - Class implementing a dialog showing the cookie data. - """ - def __init__(self, parent=None): - """ - Constructor - - @param parent reference to the parent object (QWidget) - """ - super(CookieDetailsDialog, self).__init__(parent) - self.setupUi(self) - self.setWindowFlags(Qt.Window) - - def setData(self, domain, name, path, secure, expires, value): - """ - Public method to set the data to be shown. - - @param domain domain of the cookie (string) - @param name name of the cookie (string) - @param path path of the cookie (string) - @param secure flag indicating a secure cookie (boolean) - @param expires expiration time of the cookie (string) - @param value value of the cookie (string) - """ - self.domainEdit.setText(domain) - self.nameEdit.setText(name) - self.pathEdit.setText(path) - self.secureCheckBox.setChecked(secure) - self.expirationEdit.setText(expires) - self.valueEdit.setPlainText(value)
--- a/WebBrowser/CookieJar/CookieJar.py Sun Jul 10 19:41:24 2016 +0200 +++ b/WebBrowser/CookieJar/CookieJar.py Tue Jul 12 12:48:11 2016 +0200 @@ -101,6 +101,16 @@ self.cookiesChanged.emit() + def removeCookie(self, cookie): + """ + Public method to remove a cookie. + + @param cookie cookie to be removed + @type QNetworkCookie + """ + self.__store.deleteCookie(cookie) + self.cookiesChanged.emit() + def __load(self): """ Private method to load the cookies settings. @@ -434,3 +444,18 @@ self.__load() return self.allCookies() + + def cookieDomains(self): + """ + Public method to get a list of all domains used by the cookies. + + @return list of domain names + @rtype list of str + """ + domains = [] + for cookie in self.cookies(): + domain = cookie.domain() + if domain not in domains: + domains.append(domain) + + return domains
--- a/WebBrowser/CookieJar/CookieModel.py Sun Jul 10 19:41:24 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,147 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2009 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the cookie model. -""" - -from __future__ import unicode_literals - -from PyQt5.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex -from PyQt5.QtGui import QFont, QFontMetrics - - -class CookieModel(QAbstractTableModel): - """ - Class implementing the cookie model. - """ - def __init__(self, cookieJar, parent=None): - """ - Constructor - - @param cookieJar reference to the cookie jar (CookieJar) - @param parent reference to the parent object (QObject) - """ - super(CookieModel, self).__init__(parent) - - self.__headers = [ - self.tr("Website"), - self.tr("Name"), - self.tr("Path"), - self.tr("Secure"), - self.tr("Expires"), - self.tr("Contents"), - ] - self.__cookieJar = cookieJar - self.__cookieJar.cookiesChanged.connect(self.__cookiesChanged) - - def headerData(self, section, orientation, role): - """ - Public method to get header data from the model. - - @param section section number (integer) - @param orientation orientation (Qt.Orientation) - @param role role of the data to retrieve (integer) - @return requested data - """ - if role == Qt.SizeHintRole: - fm = QFontMetrics(QFont()) - height = fm.height() + fm.height() // 3 - width = \ - fm.width(self.headerData(section, orientation, Qt.DisplayRole)) - return QSize(width, height) - - if orientation == Qt.Horizontal: - if role == Qt.DisplayRole: - try: - return self.__headers[section] - except IndexError: - return None - - return None - - return QAbstractTableModel.headerData(self, section, orientation, role) - - def data(self, index, role): - """ - Public method to get data from the model. - - @param index index to get data for (QModelIndex) - @param role role of the data to retrieve (integer) - @return requested data - """ - lst = [] - if self.__cookieJar is not None: - lst = self.__cookieJar.cookies() - if index.row() < 0 or index.row() >= len(lst): - return None - - if role in (Qt.DisplayRole, Qt.EditRole): - cookie = lst[index.row()] - col = index.column() - if col == 0: - return cookie.domain() - elif col == 1: - return bytes(cookie.name()).decode() - elif col == 2: - return cookie.path() - elif col == 3: - return cookie.isSecure() - elif col == 4: - return cookie.expirationDate() - elif col == 5: - return cookie.value() - else: - return None - - return None - - def columnCount(self, parent=QModelIndex()): - """ - Public method to get the number of columns of the model. - - @param parent parent index (QModelIndex) - @return number of columns (integer) - """ - if parent.isValid(): - return 0 - else: - return len(self.__headers) - - def rowCount(self, parent=QModelIndex()): - """ - Public method to get the number of rows of the model. - - @param parent parent index (QModelIndex) - @return number of columns (integer) - """ - if parent.isValid() or self.__cookieJar is None: - return 0 - else: - return len(self.__cookieJar.cookies()) - - def removeRows(self, row, count, parent=QModelIndex()): - """ - Public method to remove entries from the model. - - @param row start row (integer) - @param count number of rows to remove (integer) - @param parent parent index (QModelIndex) - @return flag indicating success (boolean) - """ - if parent.isValid() or self.__cookieJar is None: - return False - - lst = self.__cookieJar.cookies()[row:row + count] - self.__cookieJar.removeCookies(lst) - - return True - - def __cookiesChanged(self): - """ - Private slot handling changes of the cookies list in the cookie jar. - """ - self.beginResetModel() - self.endResetModel()
--- a/WebBrowser/CookieJar/CookiesDialog.py Sun Jul 10 19:41:24 2016 +0200 +++ b/WebBrowser/CookieJar/CookiesDialog.py Tue Jul 12 12:48:11 2016 +0200 @@ -9,18 +9,14 @@ from __future__ import unicode_literals -from PyQt5.QtCore import pyqtSlot, Qt, QDateTime, QByteArray, \ - QSortFilterProxyModel -from PyQt5.QtGui import QFont, QFontMetrics +from PyQt5.QtCore import pyqtSlot, Qt, QByteArray from PyQt5.QtWidgets import QDialog, QTreeWidgetItem -##from .CookieModel import CookieModel -## +from E5Gui import E5MessageBox + from .Ui_CookiesDialog import Ui_CookiesDialog -# TODO: Change dialog to use a QTreeWidget and show cookie data on bottom of dialog -# TODO: Remove CookieModel, CookieDetailsDialog and related files class CookiesDialog(QDialog, Ui_CookiesDialog): """ Class implementing a dialog to show all cookies. @@ -43,7 +39,6 @@ self.__cookieJar = cookieJar self.__domainDict = {} -## self.__itemDict = {} # TODO: Maybe get rid of this for cookie in self.__cookieJar.cookies(): self.__addCookie(cookie) @@ -83,131 +78,63 @@ itm.setText(0, cookie.domain()) itm.setText(1, bytes(cookie.name()).decode()) itm.setData(0, self.CookieRole, cookie) - -## self.__itemDict[itm] = cookie - -## self.removeButton.clicked.connect(self.cookiesTable.removeSelected) -## self.removeAllButton.clicked.connect(self.cookiesTable.removeAll) -## -## self.cookiesTable.verticalHeader().hide() -## model = CookieModel(cookieJar, self) -## self.__proxyModel = QSortFilterProxyModel(self) -## self.__proxyModel.setSourceModel(model) -## self.searchEdit.textChanged.connect( -## self.__proxyModel.setFilterFixedString) -## self.cookiesTable.setModel(self.__proxyModel) -## self.cookiesTable.doubleClicked.connect(self.__showCookieDetails) -## self.cookiesTable.selectionModel().selectionChanged.connect( -## self.__tableSelectionChanged) -## self.cookiesTable.model().modelReset.connect(self.__tableModelReset) -## -## fm = QFontMetrics(QFont()) -## height = fm.height() + fm.height() // 3 -## self.cookiesTable.verticalHeader().setDefaultSectionSize(height) -## self.cookiesTable.verticalHeader().setMinimumSectionSize(-1) -## for section in range(model.columnCount()): -## header = self.cookiesTable.horizontalHeader()\ -## .sectionSizeHint(section) -## if section == 0: -## header = fm.width("averagebiglonghost.averagedomain.info") -## elif section == 1: -## header = fm.width("_session_id") -## elif section == 4: -## header = fm.width( -## QDateTime.currentDateTime().toString(Qt.LocalDate)) -## buffer = fm.width("mm") -## header += buffer -## self.cookiesTable.horizontalHeader().resizeSection(section, header) -## self.cookiesTable.horizontalHeader().setStretchLastSection(True) -## self.cookiesTable.model().sort( -## self.cookiesTable.horizontalHeader().sortIndicatorSection(), -## Qt.AscendingOrder) -## -## self.__detailsDialog = None -## -## def __showCookieDetails(self, index): -## """ -## Private slot to show a dialog with the cookie details. -## -## @param index index of the entry to show (QModelIndex) -## """ -## if not index.isValid(): -## return -## -## cookiesTable = self.sender() -## if cookiesTable is None: -## return -## -## model = cookiesTable.model() -## row = index.row() -## -## domain = model.data(model.index(row, 0)) -## name = model.data(model.index(row, 1)) -## path = model.data(model.index(row, 2)) -## secure = model.data(model.index(row, 3)) -## expires = model.data(model.index(row, 4)).toString("yyyy-MM-dd hh:mm") -## data = model.data(model.index(row, 5)) -## if data is None: -## value = "" -## else: -## value = bytes(QByteArray.fromPercentEncoding(data)).decode() -## -## if self.__detailsDialog is None: -## from .CookieDetailsDialog import CookieDetailsDialog -## self.__detailsDialog = CookieDetailsDialog(self) -## self.__detailsDialog.setData(domain, name, path, secure, expires, -## value) -## self.__detailsDialog.show() @pyqtSlot() def on_addButton_clicked(self): """ Private slot to add a new exception. """ - # TODO: change this -## selection = self.cookiesTable.selectionModel().selectedRows() -## if len(selection) == 0: -## return -## -## from .CookiesExceptionsDialog import CookiesExceptionsDialog -## -## firstSelected = selection[0] -## domainSelection = firstSelected.sibling(firstSelected.row(), 0) -## domain = self.__proxyModel.data(domainSelection, Qt.DisplayRole) -## dlg = CookiesExceptionsDialog(self.__cookieJar, self) -## dlg.setDomainName(domain) -## dlg.exec_() -## -## def __tableSelectionChanged(self, selected, deselected): -## """ -## Private slot to handle a change of selected items. -## -## @param selected selected indexes (QItemSelection) -## @param deselected deselected indexes (QItemSelection) -## """ -## self.addButton.setEnabled(len(selected.indexes()) > 0) -## -## def __tableModelReset(self): -## """ -## Private slot to handle a reset of the cookies table. -## """ -## self.addButton.setEnabled(False) + current = self.cookiesTree.currentItem() + if current is None: + return + + from .CookiesExceptionsDialog import CookiesExceptionsDialog + + domain = current.text(0) + dlg = CookiesExceptionsDialog(self.__cookieJar, self) + dlg.setDomainName(domain) + dlg.exec_() @pyqtSlot() def on_removeButton_clicked(self): """ - Slot documentation goes here. + Private slot to remove the selected cookie(s). """ - # TODO: not implemented yet - raise NotImplementedError + current = self.cookiesTree.currentItem() + if current is None: + return + + if current.childCount() == 0: + # single cookie + cookie = current.data(0, self.CookieRole) + self.__cookieJar.removeCookie(cookie) + current.parent().removeChild(current) + del current + else: + cookies = [] + for row in range(current.childCount() - 1, -1, -1): + child = current.child(row) + cookies.append(child.data(0, self.CookieRole)) + current.removeChild(child) + del child + self.__cookieJar.removeCookies(cookies) + index = self.cookiesTree.indexOfTopLevelItem(current) + self.cookiesTree.takeTopLevelItem(index) + del current @pyqtSlot() def on_removeAllButton_clicked(self): """ - Slot documentation goes here. + Private slot to remove all cookies. """ - # TODO: not implemented yet - raise NotImplementedError + res = E5MessageBox.yesNo( + self, + self.tr("Remove All Cookies"), + self.tr("""Do you really want to remove all stored cookies?""")) + if res: + self.__cookieJar.clear() + self.__domainDict = {} + self.cookiesTree.clear() @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) def on_cookiesTree_currentItemChanged(self, current, previous):
--- a/WebBrowser/CookieJar/CookiesDialog.ui Sun Jul 10 19:41:24 2016 +0200 +++ b/WebBrowser/CookieJar/CookiesDialog.ui Tue Jul 12 12:48:11 2016 +0200 @@ -238,10 +238,10 @@ <item> <widget class="QPushButton" name="removeButton"> <property name="toolTip"> - <string>Press to remove the selected entries</string> + <string>Press to remove the selected cookie or list of cookies</string> </property> <property name="text"> - <string>&Remove</string> + <string>&Remove Cookies</string> </property> <property name="autoDefault"> <bool>false</bool> @@ -251,7 +251,7 @@ <item> <widget class="QPushButton" name="removeAllButton"> <property name="toolTip"> - <string>Press to remove all entries</string> + <string>Press to remove all cookies</string> </property> <property name="text"> <string>Remove &All</string>
--- a/WebBrowser/CookieJar/CookiesExceptionsDialog.py Sun Jul 10 19:41:24 2016 +0200 +++ b/WebBrowser/CookieJar/CookiesExceptionsDialog.py Tue Jul 12 12:48:11 2016 +0200 @@ -14,7 +14,6 @@ from PyQt5.QtWidgets import QDialog, QCompleter from .CookieExceptionsModel import CookieExceptionsModel -from .CookieModel import CookieModel from .Ui_CookiesExceptionsDialog import Ui_CookiesExceptionsDialog @@ -48,8 +47,8 @@ self.__proxyModel.setFilterFixedString) self.exceptionsTable.setModel(self.__proxyModel) - cookieModel = CookieModel(cookieJar, self) - self.domainEdit.setCompleter(QCompleter(cookieModel, self.domainEdit)) + self.domainEdit.setCompleter( + QCompleter(cookieJar.cookieDomains(), self.domainEdit)) f = QFont() f.setPointSize(10)
--- a/eric6.e4p Sun Jul 10 19:41:24 2016 +0200 +++ b/eric6.e4p Tue Jul 12 12:48:11 2016 +0200 @@ -1307,10 +1307,8 @@ <Source>WebBrowser/Bookmarks/XbelWriter.py</Source> <Source>WebBrowser/Bookmarks/__init__.py</Source> <Source>WebBrowser/ClosedTabsManager.py</Source> - <Source>WebBrowser/CookieJar/CookieDetailsDialog.py</Source> <Source>WebBrowser/CookieJar/CookieExceptionsModel.py</Source> <Source>WebBrowser/CookieJar/CookieJar.py</Source> - <Source>WebBrowser/CookieJar/CookieModel.py</Source> <Source>WebBrowser/CookieJar/CookiesConfigurationDialog.py</Source> <Source>WebBrowser/CookieJar/CookiesDialog.py</Source> <Source>WebBrowser/CookieJar/CookiesExceptionsDialog.py</Source>
--- a/i18n/eric6_cs.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_cs.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4616,27 +4616,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation>Webstrana</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation>Jméno</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation>Cesta</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation>Zabezpečení</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation>Platnost</translation> </message> @@ -4747,22 +4747,22 @@ <translation></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation>Stisknout pro odebrání vybraných položek</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation>Odeb&rat</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation>Stisknout pro odebrání všech položek</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> <source>Remove &All</source> <translation>Odebr&at vše</translation> </message> @@ -4772,15 +4772,115 @@ <translation>Zadejte hledaný výraz pro cookies</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> <source>Press to open the cookies exceptions dialog to add a new rule</source> <translation>Stisknutím tlačítka otevřete dialog výjimek cookies pro přidání nového pravidla</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> <source>Add R&ule...</source> <translation>Přidat p&ravidlo...</translation> </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <source>Domain:</source> + <translation type="unfinished">Doména:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished">Jméno:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished">Cesta:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished">Zabezpečení:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished">Hodnota:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookiesExceptionsDialog</name> @@ -4865,7 +4965,7 @@ <translation>Odebr&at vše</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation>Povolit pro relaci</translation> </message> @@ -23344,12 +23444,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -26737,17 +26837,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -34321,27 +34421,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation type="unfinished">Vyčistit</translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation type="unfinished">Hledat</translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation type="unfinished">Vybrat vše</translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation type="unfinished">Konfigurovat...</translation> </message> @@ -48322,144 +48422,144 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="115"/> + <location filename="../QScintilla/Shell.py" line="117"/> <source>Shell - Passive</source> <translation>Shell - pasivní</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="117"/> + <location filename="../QScintilla/Shell.py" line="119"/> <source>Shell</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="192"/> + <location filename="../QScintilla/Shell.py" line="194"/> <source>Passive >>> </source> <translation>Pasivní >>> </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="207"/> + <location filename="../QScintilla/Shell.py" line="209"/> <source>Start</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="220"/> + <location filename="../QScintilla/Shell.py" line="222"/> <source>Copy</source> <translation>Kopírovat</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="221"/> + <location filename="../QScintilla/Shell.py" line="223"/> <source>Paste</source> <translation>Vložit</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> - <source>Clear</source> - <translation>Vyčistit</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="227"/> - <source>Reset</source> - <translation>Reset</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="228"/> + <source>Clear</source> + <translation>Vyčistit</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="229"/> + <source>Reset</source> + <translation>Reset</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation>Reset a vyčistit</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="643"/> + <location filename="../QScintilla/Shell.py" line="645"/> <source>No.</source> <translation>Č.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="119"/> + <location filename="../QScintilla/Shell.py" line="121"/> <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> <translation><b>Okno Shellu</b><p>Toto je jednoduchý interpretr běžící v okně. Interpretr běží nezávisle na programu, který je debugován. To znamená, že můžete spustit jakýkoliv příkaz i během debugování.</p><p>Během vkládání příkazu můžete použít kurzorové klávesy. Je zde také historie příkazů, která se aktivuje klávesami up a down. Stisknutím up nebo down klávesy po textu, který byl zadán se spustí inkrementální vyhledávání.</p><p>Shell má několik speciálních příkazů. 'reset' zabije shell a spustí nový. 'clear' vyčistí obsah shell okna.'start' se používá pro přepnutí shell jazyka a musí za ním následovat jméno podporovaného jazyka. Podporované jazyky jsou zobrazeny v seznamu, který vrací příkaz 'languages'. Tyto příkazy (kromě 'languages') jsou také dostupné přes kontextové menu.</p><p>Stisknutím tab klávesy po nějakém vloženém textu se zobrazí seznam s nabídkou možných zakončení výrazu. Odpovídající zadání pak může být vybráno z tohoto listu. Pokud je existuje jen jedna možnost, je vložena automaticky.</p><p>Dokud se program neukončí, je shell v pasivním módu dostupný jen pokud se debugovaný program připojil k IDE. To je oznámeno odlišným promptem a dále v názvu titulku okna.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="640"/> + <location filename="../QScintilla/Shell.py" line="642"/> <source>Passive Debug Mode</source> <translation>Pasivní debug mód</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation>Historie</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation>Vybrat vstupy</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation>Historie</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation>Vybrat vstupy</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> <source>Show</source> <translation>Zobrazit</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select History</source> <translation>Vybrat historii</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select the history entry to execute (most recent shown last).</source> <translation>Vybrat vstup historie pro vykonání (nejaktuálnější zobrazen poslední).</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="641"/> + <location filename="../QScintilla/Shell.py" line="643"/> <source> Not connected</source> <translation>Nepřipojen</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="219"/> + <location filename="../QScintilla/Shell.py" line="221"/> <source>Cut</source> <translation>Vyjmout</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="645"/> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation>{0} na {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation>Shell jazyk "{0}" není podporován.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation type="unfinished">Hledat</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -48467,26 +48567,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> - <source>Unspecified syntax error. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="694"/> - <source>Exception "{0}" -{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="718"/> + <source>Unspecified syntax error. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="696"/> + <source>Exception "{0}" +{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -62478,7 +62578,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Můžete použít %-kódy a rezervovaná místa ve stringu. Podporované kódy jsou:<table><tr> <td>%C</td> <td>sloupec kurzoru v aktuálním editoru</td></tr><tr> <td>%D</td> <td>adresář v aktuálním editoru</td></tr><tr> <td>%F</td> <td>jméno souboru v aktuálním editoru</td></tr><tr> <td>%H</td> <td>home adresář aktuálního uživatele</td></tr><tr> <td>%L</td> <td>řádek s kurzorem v aktuálním editoru</td></tr><tr> <td>%P</td> <td>cesta aktuálního projektu</td></tr><tr> <td>%S</td> <td>vybraný text v aktuálním editoru</td></tr><tr> <td>%U</td> <td>uživatelské jméno aktuálního uživatele</td></tr><tr> <td>%%</td> <td>znak procenta</td></tr></table></p></translation> </message> @@ -68349,27 +68449,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation type="unfinished">Návrhy</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation type="unfinished">Žádné poslední hledání</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation type="unfinished">Poslení hledání</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation type="unfinished">Přidat '{0}'</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation type="unfinished">Smazat poslední vyhledávání</translation> </message>
--- a/i18n/eric6_de.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_de.ts Tue Jul 12 12:48:11 2016 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1913,8 +1912,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="156"/> @@ -1923,8 +1922,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="159"/> - <source>Open in New Tab Ctrl+LMB</source> - <translation>In neuem Register öffnen Strg+LMK</translation> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="162"/> @@ -2012,8 +2011,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="86"/> @@ -2022,8 +2021,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="89"/> - <source>Open in New Tab Ctrl+LMB</source> - <translation>In neuem Register öffnen Strg+LMK</translation> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="92"/> @@ -4535,27 +4534,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation>Website</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation>Pfad</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation>Sicher</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation>Läuft ab am</translation> </message> @@ -4666,22 +4665,22 @@ <translation>Cookies</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation>&Entfernen</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation>Drücken, um alle Einträge zu löschen</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> <source>Remove &All</source> <translation>&Alle entfernen</translation> </message> @@ -4691,15 +4690,115 @@ <translation>Gib den Suchbegriff für Cookies ein</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> <source>Press to open the cookies exceptions dialog to add a new rule</source> <translation>Drücken, um den Dialog für Cookie Ausnahmen zur Definition einer neuen Regel zu öffnen</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> <source>Add R&ule...</source> <translation>&Regel hinzufügen …</translation> </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation>Suchen</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation>Server</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation>Cookie Name</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <source>Domain:</source> + <translation>Domain:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation><kein Cookie ausgewählt></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation>Pfad:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation>Sicher:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation>Ablaufdatum:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation>Wert:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation>Drücken, um das ausgewählte Cookie bzw. die Liste der Cookies zu entfernen</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation>&Cookies entfernen</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation>Drücken, um alle Cookies zu löschen</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation>Alle Cookies entfernen</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation>Sollen wirklich alle gespeicherten Cookies entfernt werden? </translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation>Cookies entfernen</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation>Nur sichere Verbindungen</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation>Alle Verbindungen</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation>Sitzungscookie</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation>Cookie entfernen</translation> + </message> </context> <context> <name>CookiesExceptionsDialog</name> @@ -4784,7 +4883,7 @@ <translation>&Alle entfernen</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation>Für diese Sitzung erlauben</translation> </message> @@ -16624,8 +16723,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1208"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1281"/> @@ -22937,12 +23036,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -26302,17 +26401,17 @@ <translation>Änderungsbeschreibung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation>Fehler:</translation> </message> @@ -33822,27 +33921,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation>Löschen</translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation>Suchen</translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> @@ -47865,146 +47964,146 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="117"/> + <location filename="../QScintilla/Shell.py" line="119"/> <source>Shell</source> <translation>Shell</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> - <source>Clear</source> - <translation>Löschen</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="227"/> - <source>Reset</source> - <translation>Zurücksetzen</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="115"/> - <source>Shell - Passive</source> - <translation>Shell – Passiv</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="192"/> - <source>Passive >>> </source> - <translation>Passiv >>> </translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="220"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="221"/> - <source>Paste</source> - <translation>Einfügen</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="228"/> + <source>Clear</source> + <translation>Löschen</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="229"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="117"/> + <source>Shell - Passive</source> + <translation>Shell – Passiv</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="194"/> + <source>Passive >>> </source> + <translation>Passiv >>> </translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="222"/> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="223"/> + <source>Paste</source> + <translation>Einfügen</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation>Zurücksetzen und Löschen</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="643"/> - <source>No.</source> - <translation>Nr.</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="1684"/> - <source><p><b>{0}</b> is not a file.</p></source> - <translation><p><b>{0}</b> ist keine Datei.</p></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="207"/> - <source>Start</source> - <translation>Starten</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="645"/> + <source>No.</source> + <translation>Nr.</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="1686"/> + <source><p><b>{0}</b> is not a file.</p></source> + <translation><p><b>{0}</b> ist keine Datei.</p></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="209"/> + <source>Start</source> + <translation>Starten</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation>{0} auf {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="119"/> + <location filename="../QScintilla/Shell.py" line="121"/> <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> <translation><b>Das Shell-Fenster</b><p>Dies ist ein Interpreter Ihres Systems. Es ist derjenige, der benutzt wird, um das zu untersuchende Programm auszuführen. Dies bedeutet, dass Sie jedes Pythonkommando ausführen können, auch während Ihr Programm läuft.</p><p>Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter bedient wird. Eine inkrementelle Suche wird gestartet, indem die Cursortasten Hoch und Runter nach Eingabe von Text gedrückt werden.</p><p>Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. Diese Befehle (Ausnahme „languages“) sind auch über das Kontextmenu verfügbar.</p><p>Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.</p><p>Im passiven Debugmodus ist die Shell nur dann verfügbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation>Die Shell-Sprache „{0}“ wird nicht unterstützt. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="640"/> + <location filename="../QScintilla/Shell.py" line="642"/> <source>Passive Debug Mode</source> <translation>Passiver Debugmodus</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation>Historie</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation>Eintrag auswählen</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation>Historie</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation>Eintrag auswählen</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> <source>Show</source> <translation>Zeige</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select History</source> <translation>Eintrag auswählen</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select the history entry to execute (most recent shown last).</source> <translation>Wähle den auszuführenden Eintrag aus (aktuellster ist zuletzt dargestellt).</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="641"/> + <location filename="../QScintilla/Shell.py" line="643"/> <source> Not connected</source> <translation> nicht verbunden</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="219"/> + <location filename="../QScintilla/Shell.py" line="221"/> <source>Cut</source> <translation>Ausschneiden</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation>Suchen</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -48015,14 +48114,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> + <location filename="../QScintilla/Shell.py" line="718"/> <source>Unspecified syntax error. </source> <translation>Unspezifischer Syntaxfehler. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="694"/> + <location filename="../QScintilla/Shell.py" line="696"/> <source>Exception "{0}" {1} </source> @@ -48031,14 +48130,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="718"/> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation>Syntaxfehler "{1}" in Datei {0}, Zeile {2}, Zeichen {3}. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation>Signal "{0}" in der Datei {1} in Zeile {2} erzeugt. @@ -61846,7 +61945,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Sie können %-Codes als Platzhalter in der Eingabe verwenden. Unterstützte Codes sind:<table><tr><td>%C</td><td>Spalte des Cursor des aktuellen Editors</td></tr><tr><td>%D</td><td>Verzeichnis des aktuellen Editors</td></tr><tr><td>%F</td><td>Dateiname des aktuellen Editors</td></tr><tr><td>%H</td><td>Home-Verzeichnis des aktullen Nutzers</td></tr><tr><td>%L</td><td>Zeile des Cursor des aktuellen Editors</td></tr><tr><td>%P</td><td>Pfad des aktuellen Projektes</td></tr><tr><td>%S</td><td>selektierter Text des aktuellen Editors</td></tr><tr><td>%U</td><td>Nutzername des aktuellen Nutzers</td></tr><tr><td>%%</td><td>das Prozentzeichen</td></tr></table></p></translation> </message> @@ -67474,8 +67573,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="537"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="541"/> @@ -67696,27 +67795,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation>Vorschläge</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation>keine aktuellen Suchen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation>Aktuelle Suchen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation>„{0}“ hinzufügen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation>Aktuelle Suchen löschen</translation> </message>
--- a/i18n/eric6_en.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_en.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4494,27 +4494,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation type="unfinished"></translation> </message> @@ -4630,33 +4630,133 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> + <source>Remove &All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> + <source>Press to open the cookies exceptions dialog to add a new rule</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> + <source>Add R&ule...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> - <source>Remove &All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> - <source>Press to open the cookies exceptions dialog to add a new rule</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> - <source>Add R&ule...</source> + <source>Domain:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> <translation type="unfinished"></translation> </message> </context> @@ -4743,7 +4843,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -22821,12 +22921,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -26156,17 +26256,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -33666,27 +33766,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> @@ -47467,144 +47567,144 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="115"/> + <location filename="../QScintilla/Shell.py" line="117"/> <source>Shell - Passive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="117"/> - <source>Shell</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="119"/> + <source>Shell</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="121"/> <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="192"/> + <location filename="../QScintilla/Shell.py" line="194"/> <source>Passive >>> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="207"/> + <location filename="../QScintilla/Shell.py" line="209"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> - <source>Clear</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="219"/> - <source>Cut</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="220"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="221"/> - <source>Paste</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="227"/> - <source>Reset</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="228"/> + <source>Clear</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="221"/> + <source>Cut</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="222"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="223"/> + <source>Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="229"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select the history entry to execute (most recent shown last).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="640"/> + <location filename="../QScintilla/Shell.py" line="642"/> <source>Passive Debug Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="641"/> - <source> -Not connected</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="643"/> - <source>No.</source> + <source> +Not connected</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Shell.py" line="645"/> + <source>No.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -47612,26 +47712,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> - <source>Unspecified syntax error. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="694"/> - <source>Exception "{0}" -{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="718"/> + <source>Unspecified syntax error. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="696"/> + <source>Exception "{0}" +{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -61312,7 +61412,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation type="unfinished"></translation> </message> @@ -67141,27 +67241,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_es.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_es.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4537,27 +4537,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation>Website</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation>Nombre</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation>Ruta</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation>Segura</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation>Expira</translation> </message> @@ -4668,22 +4668,22 @@ <translation>Cookies</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation>Pulse para eliminar las entradas seleccionadas</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation>&Eliminar</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation>Pulse para eliminar todas las entradas</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> <source>Remove &All</source> <translation>Eliminar &Todas</translation> </message> @@ -4693,15 +4693,115 @@ <translation>Introduzca término de búsqueda para cookies</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> <source>Press to open the cookies exceptions dialog to add a new rule</source> <translation>Pulse para abrir el diálogo de excepciones de cookies para añadir una nueva regla</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> <source>Add R&ule...</source> <translation>Añadir &Regla...</translation> </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished">Buscar</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished">Servidor</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <source>Domain:</source> + <translation type="unfinished">Dominio:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished">Nombre:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished">Ruta:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished">Segura:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished">Valor:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished">Eliminar Todas las Cookies</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation type="unfinished">Eliminar Cookie</translation> + </message> </context> <context> <name>CookiesExceptionsDialog</name> @@ -4786,7 +4886,7 @@ <translation>Eliminar &Todas</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation>Permitir para la sesión</translation> </message> @@ -22941,12 +23041,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -26308,17 +26408,17 @@ <translation>Mensaje de Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation>Error:</translation> </message> @@ -33828,27 +33928,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation>Limpiar</translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation>Seleccionar Todo</translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation>Configurar...</translation> </message> @@ -47838,145 +47938,145 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="115"/> + <location filename="../QScintilla/Shell.py" line="117"/> <source>Shell - Passive</source> <translation>Shell - Pasivo</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="117"/> - <source>Shell</source> - <translation>Shell</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="119"/> + <source>Shell</source> + <translation>Shell</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="121"/> <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> <translation><b>Ventana de Shell</b><p>Es implemente un intérprete ejecutándose en una ventana. El intérprete es el que se usa para ejecutar el programa en depuración. Esto significa que puede ejecutar cualquier comando mientras se ejecuta el programa en depuración</p><p>Puede utilizar las teclas del cursor para entrar comandos. Tambien hay un historial de comandos que pueden ser re-invocados utilizando las teclas de cursor arriba y abajo. Presionando las teclas de arriba o abajo despues de que se ha introducido un texto comenzará una búsqueda incremental.</p><p>La shell tiene algunos comandos especiales. 'reset' mata la shell y comienza una nueva. 'clear' limpia la pantalla de la ventana de shell. 'start' se utiliza para cambiar el lenguaje de shell y debe estar seguido por un lenguaje soportado. Los lenguajes soportados se listan utilizando el comando 'lenguages'. Estos comandos, excepto 'lenguages', están tambien disponibles a traves del menú de contexto.</p><p>Presionando la tecla Tab despues de haber introducido texto mostrará una lista de los posibles 'completados' de la línea de comandos. La entrada relevante puede ser seleccionada de esta lista. Si sólamente hay disponible una entrada, se inserta automáticamente.</p><p>En modo pasivo de depuración la shell sólamente está disponible despues de que el programa en depuración ha conectado con la IDE, y hasta que termina. Esto se indica con un 'prompt' distinto y con una indicación en la leyenda de la ventana.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="192"/> + <location filename="../QScintilla/Shell.py" line="194"/> <source>Passive >>> </source> <translation>Pasivo >>> </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="207"/> + <location filename="../QScintilla/Shell.py" line="209"/> <source>Start</source> <translation>Comienzo</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="220"/> + <location filename="../QScintilla/Shell.py" line="222"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="221"/> + <location filename="../QScintilla/Shell.py" line="223"/> <source>Paste</source> <translation>Pegar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> - <source>Clear</source> - <translation>Borrar</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="227"/> - <source>Reset</source> - <translation>Restaurar</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="228"/> + <source>Clear</source> + <translation>Borrar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="229"/> + <source>Reset</source> + <translation>Restaurar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation>Restaurar y borrar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="640"/> + <location filename="../QScintilla/Shell.py" line="642"/> <source>Passive Debug Mode</source> <translation>Modo de depuración pasiva</translation> </message> <message> + <location filename="../QScintilla/Shell.py" line="645"/> + <source>No.</source> + <translation>No.</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="1686"/> + <source>Drop Error</source> + <translation>Error al soltar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation>Historial</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation>Seleccionar entrada</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="591"/> + <source>Select History</source> + <translation>Seleccionar historial</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="591"/> + <source>Select the history entry to execute (most recent shown last).</source> + <translation>Seleccionar la entrada del historial a ejecutar (las más recientes mostradas en último lugar).</translation> + </message> + <message> <location filename="../QScintilla/Shell.py" line="643"/> - <source>No.</source> - <translation>No.</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="1684"/> - <source>Drop Error</source> - <translation>Error al soltar</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation>Historial</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation>Seleccionar entrada</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="214"/> - <source>Show</source> - <translation>Mostrar</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="589"/> - <source>Select History</source> - <translation>Seleccionar historial</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="589"/> - <source>Select the history entry to execute (most recent shown last).</source> - <translation>Seleccionar la entrada del historial a ejecutar (las más recientes mostradas en último lugar).</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="641"/> <source> Not connected</source> <translation>No conectado</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="219"/> + <location filename="../QScintilla/Shell.py" line="221"/> <source>Cut</source> <translation>Cortar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="645"/> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation>{0} en {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation>Lenguaje de Shell "{0}" no soportado. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -47987,13 +48087,13 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> + <location filename="../QScintilla/Shell.py" line="718"/> <source>Unspecified syntax error. </source> <translation>Error de sintaxis sin especificar.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="694"/> + <location filename="../QScintilla/Shell.py" line="696"/> <source>Exception "{0}" {1} </source> @@ -48002,14 +48102,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="718"/> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation>Error de sintaxis "{1}" en archivo {0} en la línea {2}, carácter {3}. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation>Señal "{0}" generada en el archivo {1} y línea {2}. @@ -61801,7 +61901,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puede utilizar %-códigos como marcadores en la cadena. Los valores sportados son:<table><tr><td>%C</td><td>columna del cursos en el editor actual</td></tr><tr><td>%D</td><td>directorio del editor actual</td></tr><tr><td>%F</td><td>nombre de archivo del editor actual</td></tr><tr><td>%H</td><td>directorio home del usuario actual</td></tr><tr><td>%L</td><td>línea del cursor en el editor actual</td></tr><tr><td>%P</td><td>ruta del proyecto actual</td></tr><tr><td>%S</td><td>texto seleccionado en el editor actual</td></tr><tr><td>%U</td><td>nombre de usuario del usuario actual</td></tr><tr><td>%%</td><td>signo de porcentaje</td></tr></table></p></translation> </message> @@ -67651,27 +67751,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation>Sugerencias</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation>No hay búsquedas recientes</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation>Búsquedas Recientes</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation>Añadir '{0}'</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation>Limpiar Búsquedas recientes</translation> </message>
--- a/i18n/eric6_fr.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_fr.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4626,27 +4626,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation type="unfinished">Nom</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation type="unfinished">Chemin</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation type="unfinished"></translation> </message> @@ -4757,22 +4757,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation type="unfinished">Cliquer pour supprimer les entrées sélectionnées</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation type="unfinished">Supp&rimer</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation type="unfinished">Cliquer pour remplacer toutes les entrées</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> <source>Remove &All</source> <translation type="unfinished">Supprimer tou&t</translation> </message> @@ -4782,15 +4782,115 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> <source>Press to open the cookies exceptions dialog to add a new rule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> <source>Add R&ule...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished">Rechercher</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished">Serveur</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <source>Domain:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished">Nom:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished">Valeur:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookiesExceptionsDialog</name> @@ -4875,7 +4975,7 @@ <translation type="unfinished">Supprimer tou&t</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -23347,12 +23447,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -26735,17 +26835,17 @@ <translation type="unfinished">Message de commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -34300,27 +34400,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation type="unfinished">Effacer</translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation type="unfinished">Tout sélectionner</translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation type="unfinished">Configuration...</translation> </message> @@ -48325,144 +48425,144 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="115"/> + <location filename="../QScintilla/Shell.py" line="117"/> <source>Shell - Passive</source> <translation>Shell - Passif</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="117"/> + <location filename="../QScintilla/Shell.py" line="119"/> <source>Shell</source> <translation>Shell</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="192"/> + <location filename="../QScintilla/Shell.py" line="194"/> <source>Passive >>> </source> <translation>Passif >>></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="220"/> + <location filename="../QScintilla/Shell.py" line="222"/> <source>Copy</source> <translation>Copier</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="221"/> + <location filename="../QScintilla/Shell.py" line="223"/> <source>Paste</source> <translation>Coller</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> - <source>Clear</source> - <translation>Effacer</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="227"/> - <source>Reset</source> - <translation>Réinitialiser</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="228"/> + <source>Clear</source> + <translation>Effacer</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="229"/> + <source>Reset</source> + <translation>Réinitialiser</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation>Effacer et réinitialiser</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="643"/> + <location filename="../QScintilla/Shell.py" line="645"/> <source>No.</source> <translation>Non.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="207"/> + <location filename="../QScintilla/Shell.py" line="209"/> <source>Start</source> <translation>Lancer...</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="119"/> + <location filename="../QScintilla/Shell.py" line="121"/> <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> <translation><b>La fenêtre Shell</b><p>Il s'agit simplement d'un interpreteur Python affiché dans une fenêtre. L'interpréteur affiché est celui utilisé pour le débogage du programme en cours .Cela signifie qu'on peut exécuter n'importe quelle commande durant le débogage, en utilisant l'environnement de débug en cours.</p><p>On peut utiliser les flèches pour rappeler les commandes enregistrées dans l'historique. En appuyant sur les flèches du haut et du bas, on peut aussi rappeler les commandes qui commencent par le début du mot tapé..</p><p>Le shell possède des commandes spéciales. 'Réinitialiser' tue le shell en cours et en redémarre un nouveau. 'Effacer' efface l'affichage, et 'Lancer...' est utilisé pour basculer d'un langage shell à l'autre ('Python' ou 'Ruby'). Ces commandes sont aussi disponibles via le menu contextuel du shell.</p><p>En appuyant sur la touche Tab après avoir saisi du texte, on affiche la liste des complétions possibles. L'entrée voulue peut être sélectionnée dans la liste. Si une seule entrée est disponible, elle sera sélectionnée automatiquement.</p><p>En mode débogage passif, le shell est disponible uniquement après que le programme débogué connecté à l'IDE a été terminé. Ceci est indiqué par une invite de commande différente et par une indication dans le titre de la fenêtre.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="640"/> + <location filename="../QScintilla/Shell.py" line="642"/> <source>Passive Debug Mode</source> <translation>Mode débogueur passif</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation>Historique</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation>Sélection d'une entrée</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation>Historique</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation>Sélection d'une entrée</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> <source>Show</source> <translation>Afficher</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select History</source> <translation>Historique</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select the history entry to execute (most recent shown last).</source> <translation>Sélectionner une entrée à executer (la plus récente est à la fin).</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="641"/> + <location filename="../QScintilla/Shell.py" line="643"/> <source> Not connected</source> <translation>Non connexté</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="219"/> + <location filename="../QScintilla/Shell.py" line="221"/> <source>Cut</source> <translation type="unfinished">Couper</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="645"/> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -48470,26 +48570,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> - <source>Unspecified syntax error. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="694"/> - <source>Exception "{0}" -{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="718"/> + <source>Unspecified syntax error. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="696"/> + <source>Exception "{0}" +{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -62500,7 +62600,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Vous pouvez utiliser la syntaxe "%-code" dans la chaine de caractères. Les codes supportés sont :<table><tr><td>%C</td><td>colonne du curseur de l'éditeur courant</td></tr><tr><td>%D</td><td>répertoire de l'éditeur courant</td></tr><tr><td>%F</td><td>nom de fichier de l'éditeur courant</td></tr><tr><td>%H</td><td>répertoire 'home' de l'utilisateur courant</td></tr><tr><td>%L</td><td>ligne du curseur de l'éditeur courant</td></tr><tr><td>%P</td><td>chemin du projet courant</td></tr><tr><td>%S</td><td>texte sélectionné dans l'éditeur courant</td></tr><tr><td>%U</td><td>nom d'utilisateur de l'utilisateur courant</td></tr><tr><td>%%</td><td>le signe pourcent</td></tr></table></p></translation> </message> @@ -68384,27 +68484,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_it.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_it.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4668,27 +4668,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation>Sito web</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation>Percorso</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation>Sicurezza</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation>Scadenza</translation> </message> @@ -4799,22 +4799,22 @@ <translation>Cookies</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation>Premi per rimuovere gli elementi selezionati</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation>&Rimuovi</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation>Premi per rimuovere tutti gli elementi</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> <source>Remove &All</source> <translation>Rimuovi &Tutto</translation> </message> @@ -4824,15 +4824,115 @@ <translation>Inserisci termine di ricerca per i cookies</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> <source>Press to open the cookies exceptions dialog to add a new rule</source> <translation>Premi per aprire il dialogo delle eccezioni dei cookies per aggiungere una nuova regola</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> <source>Add R&ule...</source> <translation>Aggiungi &Regola...</translation> </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished">Ricerca</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished">Server</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <source>Domain:</source> + <translation type="unfinished">Dominio:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished">Percorso:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished">Sicurezza:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished">Valore:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookiesExceptionsDialog</name> @@ -4917,7 +5017,7 @@ <translation>Rimuovi &Tutto</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation>Consenti per la sessione</translation> </message> @@ -23486,12 +23586,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -26903,17 +27003,17 @@ <translation>Messaggio di commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel percorso.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation>Errore: </translation> </message> @@ -34475,27 +34575,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation>Pulisci</translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation>Trova</translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation>Seleziona tutti</translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation>Configura...</translation> </message> @@ -48507,146 +48607,146 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="115"/> + <location filename="../QScintilla/Shell.py" line="117"/> <source>Shell - Passive</source> <translation>Shell - Passive</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="117"/> + <location filename="../QScintilla/Shell.py" line="119"/> <source>Shell</source> <translation>Shell</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="192"/> + <location filename="../QScintilla/Shell.py" line="194"/> <source>Passive >>> </source> <translation>Passivo '>>>'</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="220"/> + <location filename="../QScintilla/Shell.py" line="222"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="221"/> + <location filename="../QScintilla/Shell.py" line="223"/> <source>Paste</source> <translation>Incolla</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> - <source>Clear</source> - <translation>Pulisci</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="227"/> - <source>Reset</source> - <translation>Resetta</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="228"/> + <source>Clear</source> + <translation>Pulisci</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="229"/> + <source>Reset</source> + <translation>Resetta</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation>Resetta e pulisci</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source>Drop Error</source> <translation>Drop Error</translation> </message> <message> + <location filename="../QScintilla/Shell.py" line="645"/> + <source>No.</source> + <translation>No.</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="209"/> + <source>Start</source> + <translation>Inizia</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="121"/> + <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> + <translation><b>La finestra Shell</b><p>Questo è un semplice interprete che viene eseguito in una finestra. L'interprete è quello usato per eseguire il programma sotto debug. Significa che puoi eseguire qualsiasi comando mentre il programma in debug viene eseguito.</p><p>Puoi usare i tasti cursore mentre inserisci i comandi. C'è inoltre una cronologia dei comandi che può essere richiamata usando i tanti su e giù. Premendo i tasti su e giù dopo che del testo è stato inserito verrà avviata una ricerca incrementale.</p><p>La shell ha alcuni comandi speciali. 'reset' uccide la shell e ne avvia una nuova. 'clear' pulisce la finestra della shell. 'start' è usato per cambiare il linguaggio della shell e deve essere seguito da uno dei linguaggi supportati. I linguaggi supportati sono elencati dal comando 'languages'. Questi comandi (eccetto 'languages') sono disponibili tramite un menù contestuale.</p><p>Premendo il tasto Tab dopo aver inserito del testo verrà mostrata una lista di possibili comandi. L'elemento rilevante può essere selezionato dalla lista. Se solo un elemento è disponibile, sarà inserito automaticamente.</p><p>In modalità di debug passiva la shell è disponibile solo dopo che il programma debuggato si è connesso all'IDE fino a quando è terminato. Questo viene indicato da un prompt differente e dal titolo della finestra.</p></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="642"/> + <source>Passive Debug Mode</source> + <translation>Passive Debug Mode</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation>Cronologia</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation>Seleziona elemento</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> + <source>Show</source> + <translation>Mostra</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="591"/> + <source>Select History</source> + <translation>Selezione cronologia</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="591"/> + <source>Select the history entry to execute (most recent shown last).</source> + <translation>Seleziona l'elemento dalla cronologia da esegurie (i più recenti sono gli ultimi).</translation> + </message> + <message> <location filename="../QScintilla/Shell.py" line="643"/> - <source>No.</source> - <translation>No.</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="207"/> - <source>Start</source> - <translation>Inizia</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="119"/> - <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> - <translation><b>La finestra Shell</b><p>Questo è un semplice interprete che viene eseguito in una finestra. L'interprete è quello usato per eseguire il programma sotto debug. Significa che puoi eseguire qualsiasi comando mentre il programma in debug viene eseguito.</p><p>Puoi usare i tasti cursore mentre inserisci i comandi. C'è inoltre una cronologia dei comandi che può essere richiamata usando i tanti su e giù. Premendo i tasti su e giù dopo che del testo è stato inserito verrà avviata una ricerca incrementale.</p><p>La shell ha alcuni comandi speciali. 'reset' uccide la shell e ne avvia una nuova. 'clear' pulisce la finestra della shell. 'start' è usato per cambiare il linguaggio della shell e deve essere seguito da uno dei linguaggi supportati. I linguaggi supportati sono elencati dal comando 'languages'. Questi comandi (eccetto 'languages') sono disponibili tramite un menù contestuale.</p><p>Premendo il tasto Tab dopo aver inserito del testo verrà mostrata una lista di possibili comandi. L'elemento rilevante può essere selezionato dalla lista. Se solo un elemento è disponibile, sarà inserito automaticamente.</p><p>In modalità di debug passiva la shell è disponibile solo dopo che il programma debuggato si è connesso all'IDE fino a quando è terminato. Questo viene indicato da un prompt differente e dal titolo della finestra.</p></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="640"/> - <source>Passive Debug Mode</source> - <translation>Passive Debug Mode</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation>Cronologia</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation>Seleziona elemento</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="214"/> - <source>Show</source> - <translation>Mostra</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="589"/> - <source>Select History</source> - <translation>Selezione cronologia</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="589"/> - <source>Select the history entry to execute (most recent shown last).</source> - <translation>Seleziona l'elemento dalla cronologia da esegurie (i più recenti sono gli ultimi).</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="641"/> <source> Not connected</source> <translation> Non connesso</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="219"/> + <location filename="../QScintilla/Shell.py" line="221"/> <source>Cut</source> <translation>Taglia</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="645"/> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation>StdErr: {0*</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation>Il linguaggio "{0}" della shell non è supportato. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation>Trova</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -48654,26 +48754,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> - <source>Unspecified syntax error. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="694"/> - <source>Exception "{0}" -{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="718"/> + <source>Unspecified syntax error. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="696"/> + <source>Exception "{0}" +{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -62727,7 +62827,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puoi usare i codici % come segnaposti nella stringa. I codici supportati sono: <table><tr><td>%C</td><td>colonna del cursore nell'editor attuale</td></tr><tr><td>%D</td><td>directory dell'editor attuale</td></tr><tr><td>%F</td><td>nome file dell'editor corrente</td></tr><tr><td>%H</td><td>directory home dell'utente attuale</td></tr><tr><td>%L</td><td>linea del cursore dell'editor attuale</td></tr><tr><td>%P</td><td>percorso del progetto attuale</td></tr><tr><td>%S</td><td>testo selezionato dell'editor attuale</td></tr><tr><td>%U</td><td>username dell'utente attuale</td></tr><tr><td>%%</td><td>Segno percentuale</td></tr></table></p></translation> </message> @@ -68607,27 +68707,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation type="unfinished">Suggerimenti</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation type="unfinished">Nessuna ricerca recente</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation type="unfinished">Ricerche recenti</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation type="unfinished">Aggiungi '{0}'</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation type="unfinished">Pulisci ricerche recenti</translation> </message>
--- a/i18n/eric6_pt.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_pt.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4665,27 +4665,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation>Sítio Web</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation>Rota</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation>Seguro</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation>Caduca</translation> </message> @@ -4801,34 +4801,134 @@ <translation>Introduzir termo de pesquisa para cookies</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation>Pressionar para retirar as entradas selecionadas</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation>&Retirar</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation>Pressionar para retirar todas as entradas</translation> </message> <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> + <source>Remove &All</source> + <translation>Retirar &Tudo</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> + <source>Press to open the cookies exceptions dialog to add a new rule</source> + <translation>Pressionar para abrir a caixa de diálogo das exceções de cookies para adicionar uma regra nova</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> + <source>Add R&ule...</source> + <translation>Adicionar Re&gra...</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished">Procurar</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished">Servidor</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> - <source>Remove &All</source> - <translation>Retirar &Tudo</translation> - </message> - <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> - <source>Press to open the cookies exceptions dialog to add a new rule</source> - <translation>Pressionar para abrir a caixa de diálogo das exceções de cookies para adicionar uma regra nova</translation> - </message> - <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> - <source>Add R&ule...</source> - <translation>Adicionar Re&gra...</translation> + <source>Domain:</source> + <translation type="unfinished">Domínio:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished">Nome:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished">Rota:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished">Seguro:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished">Valor:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -4914,7 +5014,7 @@ <translation>Retirar &Tudo</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation>Permitir na Sessão</translation> </message> @@ -23471,12 +23571,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> @@ -26880,17 +26980,17 @@ <translation>Mensagem de Cometido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation>Erro:</translation> </message> @@ -34426,27 +34526,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation>Limpar</translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation>Encontrar</translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation>Selecionar Tudo</translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation>Configurar...</translation> </message> @@ -48296,144 +48396,144 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="115"/> + <location filename="../QScintilla/Shell.py" line="117"/> <source>Shell - Passive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="117"/> - <source>Shell</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="119"/> + <source>Shell</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="121"/> <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="192"/> + <location filename="../QScintilla/Shell.py" line="194"/> <source>Passive >>> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="207"/> + <location filename="../QScintilla/Shell.py" line="209"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation>Historial</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation>Historial</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> <source>Show</source> <translation>Mostrar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> - <source>Clear</source> - <translation>Limpar</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="219"/> - <source>Cut</source> - <translation>Cortar</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="220"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="221"/> - <source>Paste</source> - <translation>Colar</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="227"/> - <source>Reset</source> - <translation type="unfinished">Reinicializar</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="228"/> + <source>Clear</source> + <translation>Limpar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="221"/> + <source>Cut</source> + <translation>Cortar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="222"/> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="223"/> + <source>Paste</source> + <translation>Colar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="229"/> + <source>Reset</source> + <translation type="unfinished">Reinicializar</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select the history entry to execute (most recent shown last).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="640"/> + <location filename="../QScintilla/Shell.py" line="642"/> <source>Passive Debug Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="641"/> + <location filename="../QScintilla/Shell.py" line="643"/> <source> Not connected</source> <translation>Desconetado</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="643"/> - <source>No.</source> - <translation>Nº</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="645"/> + <source>No.</source> + <translation>Nº</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"><p><b>{0}</b> não é um ficheiro.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation>Encontrar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -48441,26 +48541,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> - <source>Unspecified syntax error. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="694"/> - <source>Exception "{0}" -{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="718"/> + <source>Unspecified syntax error. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="696"/> + <source>Exception "{0}" +{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -62257,7 +62357,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Pode usar códigos % como espaços reservados dentro da string. Os códigos suportados são:<table><tr><td>%C</td><td>coluna do cursor do editor atual</td></tr><tr><td>%D</td><td>directório do editor atual</td></tr><tr><td>%F</td><td>nome do ficheiro do editor atual</td></tr><tr><td>%H</td><td>diretório home do usuário atual</td></tr><tr><td>%L</td><td>linha do cursor do editor atual</td></tr><tr><td>%P</td><td>rota do projeto atual</td></tr><tr><td>%S</td><td>texto selecionado do editor atual</td></tr><tr><td>%U</td><td>nome de usuário do usuário atual</td></tr><tr><td>%%</td><td>sinal de percentagem</td></tr></table></p></translation> </message> @@ -68097,27 +68197,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation type="unfinished">Sugestões</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation type="unfinished">Sem Pesquisas Recentes</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation type="unfinished">Pesquisas Recentes</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation type="unfinished">Adicionar '{0}'</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation type="unfinished">Limpar Pesquisas Recentes</translation> </message>
--- a/i18n/eric6_ru.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_ru.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4542,27 +4542,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation>WEB сайт</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation>Имя</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation>Путь</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation>Безопасно</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation>Истекают</translation> </message> @@ -4678,34 +4678,134 @@ <translation>Введите условия поиска куки</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation>Удалить выбранные записи</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation>&Удалить</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation>Удалить все записи</translation> </message> <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> + <source>Remove &All</source> + <translation>Удалить &все</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> + <source>Press to open the cookies exceptions dialog to add a new rule</source> + <translation>Открыть диалог исключения куки для добавления нового правила</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> + <source>Add R&ule...</source> + <translation>Добавить &правило...</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished">Поиск</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished">Сервер</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> - <source>Remove &All</source> - <translation>Удалить &все</translation> - </message> - <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> - <source>Press to open the cookies exceptions dialog to add a new rule</source> - <translation>Открыть диалог исключения куки для добавления нового правила</translation> - </message> - <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> - <source>Add R&ule...</source> - <translation>Добавить &правило...</translation> + <source>Domain:</source> + <translation type="unfinished">Домен:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished">Имя:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished">Путь:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished">Безопасно:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished">Значение:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished">Удалить все куки</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation type="unfinished">Удалить куки</translation> </message> </context> <context> @@ -4791,7 +4891,7 @@ <translation>Удалить &все</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation>Разрешить в текущей сессии</translation> </message> @@ -67920,27 +68020,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation>Предложения</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation>Нет недавних поисков</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation>Недавние поиски</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation>Добавить '{0}'</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation>Очистить недавние поиски</translation> </message>
--- a/i18n/eric6_tr.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_tr.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4613,27 +4613,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation>Websitesi</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation>Adı</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation>Yol</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation>Güvenilirlik</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation>Geçerlilik</translation> </message> @@ -4749,34 +4749,134 @@ <translation>Çerezlerin arama koşullarını giriniz</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation>Seçilen girişi kaldırmak için basınız</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation>Kaldı&r</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation>Tüm Girişleri kaldırkak için basınız</translation> </message> <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> + <source>Remove &All</source> + <translation>Hepsini K&aldır</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> + <source>Press to open the cookies exceptions dialog to add a new rule</source> + <translation>yeni bir kural eklemek üzer istisna çerezleri diyaloğunu açmak için basınız</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> + <source>Add R&ule...</source> + <translation>K&ural Ekle...</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished">Ara</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished">Sunucu</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> - <source>Remove &All</source> - <translation>Hepsini K&aldır</translation> - </message> - <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> - <source>Press to open the cookies exceptions dialog to add a new rule</source> - <translation>yeni bir kural eklemek üzer istisna çerezleri diyaloğunu açmak için basınız</translation> - </message> - <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> - <source>Add R&ule...</source> - <translation>K&ural Ekle...</translation> + <source>Domain:</source> + <translation type="unfinished">Etki Alanı:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished">Adı:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished">Yol:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished">Güvenilirlik:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished">Değer:</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -4862,7 +4962,7 @@ <translation>Hepsini K&aldır</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation>Oturumu Kabul Etmek</translation> </message> @@ -23320,12 +23420,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -26706,17 +26806,17 @@ <translation type="unfinished">Teslimat mesajı</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -34277,27 +34377,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation type="unfinished">Temizle</translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation type="unfinished">Bul</translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation type="unfinished">Hepsini Seç</translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation type="unfinished">Ayarlanıyor...</translation> </message> @@ -48157,146 +48257,146 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="115"/> + <location filename="../QScintilla/Shell.py" line="117"/> <source>Shell - Passive</source> <translation>Pasif- Kabuk</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="117"/> - <source>Shell</source> - <translation>Kabuk</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="119"/> + <source>Shell</source> + <translation>Kabuk</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="121"/> <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> <translation><b>Kabu Penceresi</b><p>Bu basit bir yorumlayıcı penceresidir. Koşturulan programın hata yakalamasının yapılacağı bir arayüzdür.Bunun anlamı programda hata yakalamaya başladığınızda kabuk üzerinden istediğiniz comutu girebileceğinizdir.</p><p>İmleç tuşları ile daha önceden girilen komutlar arasında dolaşabilirsiniz. Aşağı yada yukarı tuşlarına bastıktan sonra klavyeden gireceğiniz harf ve kelimelere göre arama başlatırsınız.</p><p>Kabuğun bazı özel komutları vardır. 'reset'kabuğu sıfırlar ve yeni bir tane başlatır. 'clear' kabuk penceresini temziler. 'start'kullanılan kabuk dilinden bir sonraki kabuk diline geçirir. Desteklenen diller 'languages' komutu ile listelenir. Bu komutlar (except 'languages') sağ tuş menusü ilede ulaşılabilir.</p><p>Bazı metinleri girdikten sonra tab tuşuna bazarsanız tamamlanabilecek kelimelerin bir listesi gelir. Konuyla ilgili kelimelri bu listede seçebilirsiniz.Eğer girilebilecek tek bir seçenek varsa , bu otomat,k olarak eklenir.</p><p> Pasif hata ayıklama modunda bu tamamlanana kadar IDLE kullanılamaz.Bu durum pencere başlığında farklı çıktılar ile gösterilir.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="192"/> + <location filename="../QScintilla/Shell.py" line="194"/> <source>Passive >>> </source> <translation>Pasif >>></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="207"/> + <location filename="../QScintilla/Shell.py" line="209"/> <source>Start</source> <translation>Başla</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation>Geçmiş</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation>Girişi Seç</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation>Geçmiş</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation>Girişi Seç</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> <source>Show</source> <translation>Göster</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> + <location filename="../QScintilla/Shell.py" line="228"/> <source>Clear</source> <translation>Temizle</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="219"/> - <source>Cut</source> - <translation>Kes</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="220"/> - <source>Copy</source> - <translation>Kopyala</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="221"/> + <source>Cut</source> + <translation>Kes</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="222"/> + <source>Copy</source> + <translation>Kopyala</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="223"/> <source>Paste</source> <translation>Yapıştır</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="227"/> + <location filename="../QScintilla/Shell.py" line="229"/> <source>Reset</source> <translation>Başadön</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="228"/> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation>Başadön ve temizle</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select History</source> <translation>Geçmişi Seç</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select the history entry to execute (most recent shown last).</source> <translation>geçmişte yapılanları göster (ençok gösterilenleri seç).</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="640"/> + <location filename="../QScintilla/Shell.py" line="642"/> <source>Passive Debug Mode</source> <translation>Pasif Hata Ayıklama Modu</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="641"/> + <location filename="../QScintilla/Shell.py" line="643"/> <source> Not connected</source> <translation> Bağlantı yok</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="643"/> + <location filename="../QScintilla/Shell.py" line="645"/> <source>No.</source> <translation>NO.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="645"/> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation>{0} üzerin {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation>Stdçıktı:{0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation>stdhata: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation>Kabuk dili "{0}" desteklenmiyor. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation type="unfinished">Bul</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -48304,26 +48404,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> - <source>Unspecified syntax error. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="694"/> - <source>Exception "{0}" -{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="718"/> + <source>Unspecified syntax error. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="696"/> + <source>Exception "{0}" +{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -62242,7 +62342,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>%-alanlarda çeşitli kodları kullanabilirsiniz. Tanımlanan kodlar:<table><tr><td>%C</td><td>geçerli düzenleyicinin imlecinin sütunu</td></tr><tr><td>%D</td><td>geçerli düzenleyicinin dizini</td></tr><tr><td>%F</td><td>geçerli düzenleyicinin dosya adı</td></tr><tr><td>%H</td><td>geçerli kullancının ana dizini</td></tr><tr><td>%L</td><td>geçerli düzenleyicinin imlecinin satırı</td></tr><tr><td>%P</td><td>geçerli projenin yolu</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>Geçici kullanıcının kullanıcı adı</td></tr><tr><td>%%</td><td>oran işareti</td></tr></table></p></translation> </message> @@ -68101,27 +68201,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation type="unfinished">Teklifler</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation type="unfinished">Geçmiş Arama Yok</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation type="unfinished">Enson Aramalar</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation type="unfinished">Ekle '{0}'</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation type="unfinished">Arama Geçmişini Temizle</translation> </message>
--- a/i18n/eric6_zh_CN.ts Sun Jul 10 19:41:24 2016 +0200 +++ b/i18n/eric6_zh_CN.ts Tue Jul 12 12:48:11 2016 +0200 @@ -4614,27 +4614,27 @@ <context> <name>CookieModel</name> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="30"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="30"/> <source>Website</source> <translation>网站</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="31"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="31"/> <source>Name</source> <translation>名称</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="32"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="32"/> <source>Path</source> <translation>路径</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="33"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="33"/> <source>Secure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieModel.py" line="34"/> + <location filename="../Helpviewer/CookieJar/CookieModel.py" line="34"/> <source>Expires</source> <translation type="unfinished"></translation> </message> @@ -4745,22 +4745,22 @@ <translation type="unfinished">Cookies</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="79"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="79"/> <source>Press to remove the selected entries</source> <translation type="unfinished">点击移除选中的条目</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="82"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="82"/> <source>&Remove</source> <translation type="unfinished">移除(&R)</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="92"/> + <location filename="../Helpviewer/CookieJar/CookiesDialog.ui" line="92"/> <source>Press to remove all entries</source> <translation type="unfinished">点击移除所有条目</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="257"/> <source>Remove &All</source> <translation type="unfinished">移除全部(&A)</translation> </message> @@ -4770,15 +4770,115 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="105"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="267"/> <source>Press to open the cookies exceptions dialog to add a new rule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="108"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="270"/> <source>Add R&ule...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="52"/> + <source>Search</source> + <translation type="unfinished">搜索</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="73"/> + <source>Server</source> + <translation type="unfinished">服务器</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="78"/> + <source>Cookie Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="95"/> + <source>Domain:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="162"/> + <source><no cookie selected></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="118"/> + <source>Name:</source> + <translation type="unfinished">名称：</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="141"/> + <source>Path:</source> + <translation type="unfinished">路径：</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="164"/> + <source>Secure:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="187"/> + <source>Expiration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="210"/> + <source>Value:</source> + <translation type="unfinished">值：</translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="241"/> + <source>Press to remove the selected cookie or list of cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="244"/> + <source>&Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="254"/> + <source>Press to remove all cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Remove All Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="130"/> + <source>Do you really want to remove all stored cookies?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="164"/> + <source>Remove Cookies</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="173"/> + <source>Secure connections only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="175"/> + <source>All connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <source>Session Cookie</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="184"/> + <source>Remove Cookie</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookiesExceptionsDialog</name> @@ -4863,7 +4963,7 @@ <translation type="unfinished">移除全部(&A)</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="66"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="65"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -23298,12 +23398,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -26692,17 +26792,17 @@ <translation type="unfinished">提交消息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="112"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="198"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -34233,27 +34333,27 @@ <context> <name>LogViewerEdit</name> <message> - <location filename="../UI/LogView.py" line="115"/> + <location filename="../UI/LogView.py" line="116"/> <source>Clear</source> <translation>清除</translation> </message> <message> - <location filename="../UI/LogView.py" line="116"/> + <location filename="../UI/LogView.py" line="117"/> <source>Copy</source> <translation>复制</translation> </message> <message> - <location filename="../UI/LogView.py" line="118"/> + <location filename="../UI/LogView.py" line="119"/> <source>Find</source> <translation>查找</translation> </message> <message> - <location filename="../UI/LogView.py" line="120"/> + <location filename="../UI/LogView.py" line="121"/> <source>Select All</source> <translation>全选</translation> </message> <message> - <location filename="../UI/LogView.py" line="122"/> + <location filename="../UI/LogView.py" line="123"/> <source>Configure...</source> <translation>配置…</translation> </message> @@ -48263,145 +48363,145 @@ <context> <name>Shell</name> <message> - <location filename="../QScintilla/Shell.py" line="115"/> + <location filename="../QScintilla/Shell.py" line="117"/> <source>Shell - Passive</source> <translation>命令行 - 被动</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="117"/> - <source>Shell</source> - <translation>命令行</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="119"/> + <source>Shell</source> + <translation>命令行</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="121"/> <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> <translation><b>命令行窗口</b><p>就是一个运行在窗口中的解释器。该解释器用于运行被调试的程序。也就是说你可以在调试程序时执行任何命令。</p><p>在输入命令时可以使用方向键。也可以使用向上或向下键重新调用已运行过的命令。在一些文字后按下向上或向下键将开始增量搜索。</p><p>命令行具有一些特殊命令。“reset”重新开始一个新的命令行。“clear”清除命令行窗口的显示。“start”用于开关命令行语言，其后必须加上一个支持的语言。支持的语言可通过“languages”命令列出。这些命令（“languages”除外）也可以通过上下文菜单进行调用。</p><p>在一些输入的文字后按下 Tab 键将显示一个可用命令行列表。可能通过该列表选择相关的条目。仅有一个条目可用时，将自动插入该条目。</p><p>在被动调试模式中，命令行只在要调试的程序连接到 IDE 以后才有效，直到调试完成。这一点将通过不同的提示符和窗口标题来指示。</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="192"/> + <location filename="../QScintilla/Shell.py" line="194"/> <source>Passive >>> </source> <translation>被动 >>></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="207"/> + <location filename="../QScintilla/Shell.py" line="209"/> <source>Start</source> <translation>开始</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="212"/> - <source>History</source> - <translation>历史</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="213"/> - <source>Select entry</source> - <translation>选择条目</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="214"/> + <source>History</source> + <translation>历史</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="215"/> + <source>Select entry</source> + <translation>选择条目</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="216"/> <source>Show</source> <translation>显示</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="226"/> - <source>Clear</source> - <translation>清除</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="220"/> - <source>Copy</source> - <translation>复制</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="221"/> - <source>Paste</source> - <translation>粘贴</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="227"/> - <source>Reset</source> - <translation>重置</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="228"/> + <source>Clear</source> + <translation>清除</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="222"/> + <source>Copy</source> + <translation>复制</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="223"/> + <source>Paste</source> + <translation>粘贴</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="229"/> + <source>Reset</source> + <translation>重置</translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="230"/> <source>Reset and Clear</source> <translation>重置并清除</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="233"/> + <location filename="../QScintilla/Shell.py" line="235"/> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select History</source> <translation>选择历史</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="589"/> + <location filename="../QScintilla/Shell.py" line="591"/> <source>Select the history entry to execute (most recent shown last).</source> <translation>选择历史条目以执行（最常用的显示在最后）。</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="640"/> + <location filename="../QScintilla/Shell.py" line="642"/> <source>Passive Debug Mode</source> <translation>被动调试模式</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="641"/> + <location filename="../QScintilla/Shell.py" line="643"/> <source> Not connected</source> <translation> 没有连接</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="643"/> + <location filename="../QScintilla/Shell.py" line="645"/> <source>No.</source> <translation>No.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="219"/> + <location filename="../QScintilla/Shell.py" line="221"/> <source>Cut</source> <translation>剪切</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="645"/> + <location filename="../QScintilla/Shell.py" line="647"/> <source>{0} on {1}, {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="783"/> + <location filename="../QScintilla/Shell.py" line="785"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="791"/> + <location filename="../QScintilla/Shell.py" line="793"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1399"/> + <location filename="../QScintilla/Shell.py" line="1401"/> <source>Shell language "{0}" not supported. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1684"/> + <location filename="../QScintilla/Shell.py" line="1686"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="224"/> + <location filename="../QScintilla/Shell.py" line="226"/> <source>Find</source> <translation type="unfinished">查找</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="684"/> + <location filename="../QScintilla/Shell.py" line="686"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -48409,26 +48509,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="716"/> - <source>Unspecified syntax error. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="694"/> - <source>Exception "{0}" -{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="718"/> + <source>Unspecified syntax error. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="696"/> + <source>Exception "{0}" +{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="720"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="741"/> + <location filename="../QScintilla/Shell.py" line="743"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -62433,7 +62533,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1331"/> + <location filename="../Utilities/__init__.py" line="1353"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>可以在字符串中使用“%-代码”作为占位符。支持的代码有：<table><tr><td>%C</td><td>当前编辑器的光标所在列</td></tr><tr><td>%D</td><td>当前编辑器的文件夹</td></tr><tr><td>%F</td><td>当前编辑器的文件名</td></tr><tr><td>%H</td><td>当前用户的根目录</td></tr><tr><td>%L</td><td>当前编辑器的光标所在行</td></tr><tr><td>%P</td><td>当前项目的路径</td></tr><tr><td>%S</td><td>当前编辑器中选择的文本</td></tr><tr><td>%U</td><td>当前用户的用户名</td></tr><tr><td>%%</td><td>百分比符号</td></tr></table></p></translation> </message> @@ -68305,27 +68405,27 @@ <context> <name>WebBrowserWebSearchWidget</name> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="136"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="138"/> <source>Suggestions</source> <translation type="unfinished">建议</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="145"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="147"/> <source>No Recent Searches</source> <translation type="unfinished">没有最近的搜索</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="150"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="152"/> <source>Recent Searches</source> <translation type="unfinished">最近的搜索</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="278"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="280"/> <source>Add '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="288"/> + <location filename="../WebBrowser/WebBrowserWebSearchWidget.py" line="290"/> <source>Clear Recent Searches</source> <translation type="unfinished">清空最近搜索</translation> </message>
