diff -r 1ce5e98ebc43 -r b728bb00886e i18n/eric6_en.ts --- 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>