--- a/i18n/eric5_en.ts Thu May 26 19:37:00 2011 +0200
+++ b/i18n/eric5_en.ts Fri May 27 18:22:07 2011 +0200
@@ -6769,7 +6769,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5730"/>
+ <location filename="QScintilla/Editor.py" line="5748"/>
<source>Check spelling...</source>
<translation type="unfinished"></translation>
</message>
@@ -7019,7 +7019,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4073"/>
+ <location filename="QScintilla/Editor.py" line="4091"/>
<source>Enable breakpoint</source>
<translation type="unfinished"></translation>
</message>
@@ -7204,275 +7204,295 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4076"/>
+ <location filename="QScintilla/Editor.py" line="4094"/>
<source>Disable breakpoint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4365"/>
+ <location filename="QScintilla/Editor.py" line="4383"/>
<source>Code Coverage</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4365"/>
+ <location filename="QScintilla/Editor.py" line="4383"/>
<source>Please select a coverage file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4411"/>
+ <location filename="QScintilla/Editor.py" line="4429"/>
<source>Show Code Coverage Annotations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4407"/>
+ <location filename="QScintilla/Editor.py" line="4425"/>
<source>All lines have been covered.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4411"/>
+ <location filename="QScintilla/Editor.py" line="4429"/>
<source>There is no coverage file available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4503"/>
+ <location filename="QScintilla/Editor.py" line="4521"/>
<source>Profile Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4503"/>
+ <location filename="QScintilla/Editor.py" line="4521"/>
<source>Please select a profile file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4633"/>
+ <location filename="QScintilla/Editor.py" line="4651"/>
<source>Syntax Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4633"/>
+ <location filename="QScintilla/Editor.py" line="4651"/>
<source>No syntax error message available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4759"/>
+ <location filename="QScintilla/Editor.py" line="4777"/>
<source>py3flakes Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4759"/>
+ <location filename="QScintilla/Editor.py" line="4777"/>
<source>No py3flakes warning message available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4858"/>
+ <location filename="QScintilla/Editor.py" line="4876"/>
<source>Macro Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4858"/>
+ <location filename="QScintilla/Editor.py" line="4876"/>
<source>Select a macro name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4886"/>
+ <location filename="QScintilla/Editor.py" line="4904"/>
<source>Load macro file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4926"/>
+ <location filename="QScintilla/Editor.py" line="4944"/>
<source>Macro files (*.macro)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4907"/>
+ <location filename="QScintilla/Editor.py" line="4925"/>
<source>Error loading macro</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4900"/>
+ <location filename="QScintilla/Editor.py" line="4918"/>
<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="4907"/>
+ <location filename="QScintilla/Editor.py" line="4925"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4926"/>
+ <location filename="QScintilla/Editor.py" line="4944"/>
<source>Save macro file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4943"/>
+ <location filename="QScintilla/Editor.py" line="4961"/>
<source>Save macro</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4943"/>
+ <location filename="QScintilla/Editor.py" line="4961"/>
<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="4958"/>
+ <location filename="QScintilla/Editor.py" line="4976"/>
<source>Error saving macro</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4958"/>
+ <location filename="QScintilla/Editor.py" line="4976"/>
<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="4969"/>
+ <location filename="QScintilla/Editor.py" line="4987"/>
<source>Start Macro Recording</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4969"/>
+ <location filename="QScintilla/Editor.py" line="4987"/>
<source>Macro recording is already active. Start new?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4994"/>
+ <location filename="QScintilla/Editor.py" line="5012"/>
<source>Macro Recording</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4994"/>
+ <location filename="QScintilla/Editor.py" line="5012"/>
<source>Enter name of the macro:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5107"/>
+ <location filename="QScintilla/Editor.py" line="5125"/>
<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="5116"/>
+ <location filename="QScintilla/Editor.py" line="5134"/>
<source>File changed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5195"/>
+ <location filename="QScintilla/Editor.py" line="5213"/>
<source>{0} (ro)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5312"/>
- <source>Drop Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="QScintilla/Editor.py" line="5312"/>
- <source><p><b>{0}</b> is not a file.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="QScintilla/Editor.py" line="5330"/>
+ <source>Drop Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="5330"/>
+ <source><p><b>{0}</b> is not a file.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="5348"/>
<source>Resources</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5332"/>
+ <location filename="QScintilla/Editor.py" line="5350"/>
<source>Add file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5334"/>
+ <location filename="QScintilla/Editor.py" line="5352"/>
<source>Add files...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5336"/>
+ <location filename="QScintilla/Editor.py" line="5354"/>
<source>Add aliased file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5338"/>
+ <location filename="QScintilla/Editor.py" line="5356"/>
<source>Add localized resource...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5341"/>
- <source>Add resource frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="QScintilla/Editor.py" line="5359"/>
+ <source>Add resource frame</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="5377"/>
<source>Add file resource</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5375"/>
+ <location filename="QScintilla/Editor.py" line="5393"/>
<source>Add file resources</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5402"/>
+ <location filename="QScintilla/Editor.py" line="5420"/>
<source>Add aliased file resource</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5402"/>
+ <location filename="QScintilla/Editor.py" line="5420"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5463"/>
+ <location filename="QScintilla/Editor.py" line="5481"/>
<source>Package Diagram</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5463"/>
+ <location filename="QScintilla/Editor.py" line="5481"/>
<source>Include class attributes?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5480"/>
+ <location filename="QScintilla/Editor.py" line="5498"/>
<source>Imports Diagram</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5480"/>
+ <location filename="QScintilla/Editor.py" line="5498"/>
<source>Include imports from external modules?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5492"/>
+ <location filename="QScintilla/Editor.py" line="5510"/>
<source>Application Diagram</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5492"/>
+ <location filename="QScintilla/Editor.py" line="5510"/>
<source>Include module names?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5732"/>
+ <location filename="QScintilla/Editor.py" line="5750"/>
<source>Add to dictionary</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5734"/>
+ <location filename="QScintilla/Editor.py" line="5752"/>
<source>Ignore All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4802"/>
+ <location filename="QScintilla/Editor.py" line="4820"/>
<source>Warning: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4808"/>
+ <location filename="QScintilla/Editor.py" line="4826"/>
<source>Error: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5112"/>
+ <location filename="QScintilla/Editor.py" line="5130"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="3706"/>
+ <source>Activating Auto-Completion Provider</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="3706"/>
+ <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="3891"/>
+ <source>Activating Calltip Provider</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="3891"/>
+ <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EditorAPIsPage</name>
@@ -18233,12 +18253,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="99"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/>
<source>Unguarded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="104"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/>
<source>no patches found</source>
<translation type="unfinished"></translation>
</message>
@@ -31524,59 +31544,59 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="487"/>
+ <location filename="QScintilla/Shell.py" line="489"/>
<source>Select History</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="487"/>
+ <location filename="QScintilla/Shell.py" line="489"/>
<source>Select the history entry to execute (most recent shown last).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="536"/>
+ <location filename="QScintilla/Shell.py" line="538"/>
<source>Passive Debug Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="537"/>
- <source>
-Not connected</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="QScintilla/Shell.py" line="539"/>
- <source>No.</source>
+ <source>
+Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="QScintilla/Shell.py" line="541"/>
+ <source>No.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Shell.py" line="543"/>
<source>{0} on {1}, {2}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="602"/>
+ <location filename="QScintilla/Shell.py" line="604"/>
<source>StdOut: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="610"/>
+ <location filename="QScintilla/Shell.py" line="612"/>
<source>StdErr: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="1102"/>
+ <location filename="QScintilla/Shell.py" line="1104"/>
<source>Shell language "{0}" not supported.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="1372"/>
+ <location filename="QScintilla/Shell.py" line="1374"/>
<source>Drop Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="1372"/>
+ <location filename="QScintilla/Shell.py" line="1374"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
