--- a/i18n/eric5_en.ts Wed Jan 15 18:59:03 2014 +0100 +++ b/i18n/eric5_en.ts Wed Jan 15 19:05:51 2014 +0100 @@ -3648,7 +3648,7 @@ <context> <name>CodingError</name> <message> - <location filename="../Utilities/__init__.py" line="102"/> + <location filename="../Utilities/__init__.py" line="103"/> <source>The coding '{0}' is wrong for the given text.</source> <translation type="unfinished"></translation> </message> @@ -8742,7 +8742,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6763"/> + <location filename="../QScintilla/Editor.py" line="6772"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -9172,257 +9172,257 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5144"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5144"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5198"/> + <location filename="../QScintilla/Editor.py" line="5207"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5191"/> + <location filename="../QScintilla/Editor.py" line="5200"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5198"/> + <location filename="../QScintilla/Editor.py" line="5207"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5296"/> + <location filename="../QScintilla/Editor.py" line="5305"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5296"/> + <location filename="../QScintilla/Editor.py" line="5305"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5439"/> + <location filename="../QScintilla/Editor.py" line="5448"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5439"/> + <location filename="../QScintilla/Editor.py" line="5448"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5733"/> + <location filename="../QScintilla/Editor.py" line="5742"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5733"/> + <location filename="../QScintilla/Editor.py" line="5742"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5761"/> + <location filename="../QScintilla/Editor.py" line="5770"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5804"/> + <location filename="../QScintilla/Editor.py" line="5813"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5784"/> + <location filename="../QScintilla/Editor.py" line="5793"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5775"/> - <source><p>The macro file <b>{0}</b> could not be read.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5784"/> + <source><p>The macro file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5793"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5804"/> + <location filename="../QScintilla/Editor.py" line="5813"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5821"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5821"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5837"/> + <location filename="../QScintilla/Editor.py" line="5846"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5837"/> + <location filename="../QScintilla/Editor.py" line="5846"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5850"/> + <location filename="../QScintilla/Editor.py" line="5859"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5850"/> + <location filename="../QScintilla/Editor.py" line="5859"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5876"/> + <location filename="../QScintilla/Editor.py" line="5885"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5876"/> + <location filename="../QScintilla/Editor.py" line="5885"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5998"/> + <location filename="../QScintilla/Editor.py" line="6007"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6008"/> + <location filename="../QScintilla/Editor.py" line="6017"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6147"/> + <location filename="../QScintilla/Editor.py" line="6156"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6280"/> + <location filename="../QScintilla/Editor.py" line="6289"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6280"/> + <location filename="../QScintilla/Editor.py" line="6289"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> - <source>Resources</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6303"/> - <source>Add file...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6305"/> - <source>Add files...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6307"/> - <source>Add aliased file...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6310"/> - <source>Add localized resource...</source> + <source>Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6312"/> + <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6314"/> + <source>Add files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6316"/> + <source>Add aliased file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6319"/> + <source>Add localized resource...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6323"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6333"/> + <location filename="../QScintilla/Editor.py" line="6342"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6349"/> + <location filename="../QScintilla/Editor.py" line="6358"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6377"/> + <location filename="../QScintilla/Editor.py" line="6386"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6377"/> + <location filename="../QScintilla/Editor.py" line="6386"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6441"/> + <location filename="../QScintilla/Editor.py" line="6450"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6441"/> + <location filename="../QScintilla/Editor.py" line="6450"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6470"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6470"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6475"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6475"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6766"/> + <location filename="../QScintilla/Editor.py" line="6775"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6777"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5672"/> + <location filename="../QScintilla/Editor.py" line="5681"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5679"/> + <location filename="../QScintilla/Editor.py" line="5688"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6004"/> + <location filename="../QScintilla/Editor.py" line="6013"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -9467,27 +9467,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7188"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7188"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5608"/> + <location filename="../QScintilla/Editor.py" line="5617"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5608"/> + <location filename="../QScintilla/Editor.py" line="5617"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5669"/> + <location filename="../QScintilla/Editor.py" line="5678"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -55981,23 +55981,28 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1178"/> + <location filename="../Utilities/__init__.py" line="1179"/> <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> <message> - <location filename="../Utilities/__init__.py" line="1376"/> + <location filename="../Utilities/__init__.py" line="1378"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/__init__.py" line="1432"/> + <location filename="../Utilities/__init__.py" line="1454"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/__init__.py" line="1423"/> - <source>Invalid data received from Python2 syntax checker.</source> + <location filename="../Utilities/__init__.py" line="1389"/> + <source>Codingerror: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Utilities/__init__.py" line="1445"/> + <source>eric5 error: Invalid data received from Python2 syntax checker.</source> <translation type="unfinished"></translation> </message> </context>