--- a/i18n/eric5_zh_CN.GB2312.ts Thu May 26 19:37:00 2011 +0200
+++ b/i18n/eric5_zh_CN.GB2312.ts Fri May 27 18:22:07 2011 +0200
@@ -7538,7 +7538,7 @@
<translation>全部取消选择</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5730"/>
+ <location filename="QScintilla/Editor.py" line="5748"/>
<source>Check spelling...</source>
<translation>正在进行拼写检查……</translation>
</message>
@@ -7793,7 +7793,7 @@
<translation>编辑断点……</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4073"/>
+ <location filename="QScintilla/Editor.py" line="4091"/>
<source>Enable breakpoint</source>
<translation>允许断点</translation>
</message>
@@ -7958,42 +7958,42 @@
<translation>自动完成无效，没有设定自动完成源。</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4076"/>
+ <location filename="QScintilla/Editor.py" line="4094"/>
<source>Disable breakpoint</source>
<translation>去除断点</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4365"/>
+ <location filename="QScintilla/Editor.py" line="4383"/>
<source>Code Coverage</source>
<translation>代码覆盖率</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>请选择一个覆盖率文件</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4411"/>
+ <location filename="QScintilla/Editor.py" line="4429"/>
<source>Show Code Coverage Annotations</source>
<translation>显示代码覆盖率注解</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>所有行均被已覆盖。</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>没有有效的覆盖率文件。</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4503"/>
+ <location filename="QScintilla/Editor.py" line="4521"/>
<source>Profile Data</source>
<translation>剖析数据</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>请选择一个剖析文件</translation>
</message>
@@ -8018,37 +8018,37 @@
<translation type="obsolete">请选择要移除的循环报告</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4633"/>
+ <location filename="QScintilla/Editor.py" line="4651"/>
<source>Syntax Error</source>
<translation>语法错误</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>语法错误消息无效。</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4858"/>
+ <location filename="QScintilla/Editor.py" line="4876"/>
<source>Macro Name</source>
<translation>宏名称</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4858"/>
+ <location filename="QScintilla/Editor.py" line="4876"/>
<source>Select a macro name:</source>
<translation>选择一个宏名称：</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4886"/>
+ <location filename="QScintilla/Editor.py" line="4904"/>
<source>Load macro file</source>
<translation>输入宏文件</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4926"/>
+ <location filename="QScintilla/Editor.py" line="4944"/>
<source>Macro files (*.macro)</source>
<translation>宏文件 (*.macro)</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4907"/>
+ <location filename="QScintilla/Editor.py" line="4925"/>
<source>Error loading macro</source>
<translation>载入宏文件出错</translation>
</message>
@@ -8063,12 +8063,12 @@
<translation type="obsolete"><p>宏文件 <b>%1</b> 已损坏。</p></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4926"/>
+ <location filename="QScintilla/Editor.py" line="4944"/>
<source>Save macro file</source>
<translation>保存宏文件</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4943"/>
+ <location filename="QScintilla/Editor.py" line="4961"/>
<source>Save macro</source>
<translation>保存宏</translation>
</message>
@@ -8078,7 +8078,7 @@
<translation type="obsolete"><p>宏文件 <b>%1</b> 已存在。</p></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4958"/>
+ <location filename="QScintilla/Editor.py" line="4976"/>
<source>Error saving macro</source>
<translation>保存宏出错</translation>
</message>
@@ -8088,22 +8088,22 @@
<translation type="obsolete"><p>无法写入宏文件 <b>%1</b> 。</p></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4969"/>
+ <location filename="QScintilla/Editor.py" line="4987"/>
<source>Start Macro Recording</source>
<translation>开始宏录制</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>宏录制已激活。开始录制新宏？</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="4994"/>
+ <location filename="QScintilla/Editor.py" line="5012"/>
<source>Macro Recording</source>
<translation>宏录制</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>输入宏名称：</translation>
</message>
@@ -8118,7 +8118,7 @@
<translation type="obsolete"><br><b>警告：</b> 重新打开将导致更改丢失。</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5116"/>
+ <location filename="QScintilla/Editor.py" line="5134"/>
<source>File changed</source>
<translation>文件已改变</translation>
</message>
@@ -8128,7 +8128,7 @@
<translation type="obsolete">%1 (ro)</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5312"/>
+ <location filename="QScintilla/Editor.py" line="5330"/>
<source>Drop Error</source>
<translation>降落误差</translation>
</message>
@@ -8138,47 +8138,47 @@
<translation type="obsolete"><p><b>%1</b> 不是一个文件。</p></translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5330"/>
+ <location filename="QScintilla/Editor.py" line="5348"/>
<source>Resources</source>
<translation>资源</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5332"/>
+ <location filename="QScintilla/Editor.py" line="5350"/>
<source>Add file...</source>
<translation>添加文件……</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5334"/>
+ <location filename="QScintilla/Editor.py" line="5352"/>
<source>Add files...</source>
<translation>添加文件……</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5336"/>
+ <location filename="QScintilla/Editor.py" line="5354"/>
<source>Add aliased file...</source>
<translation>添加别名文件……</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5338"/>
+ <location filename="QScintilla/Editor.py" line="5356"/>
<source>Add localized resource...</source>
<translation>添加本地资源……</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5341"/>
- <source>Add resource frame</source>
- <translation>添加资源结构</translation>
- </message>
- <message>
<location filename="QScintilla/Editor.py" line="5359"/>
+ <source>Add resource frame</source>
+ <translation>添加资源结构</translation>
+ </message>
+ <message>
+ <location filename="QScintilla/Editor.py" line="5377"/>
<source>Add file resource</source>
<translation>添加文件资源</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5375"/>
+ <location filename="QScintilla/Editor.py" line="5393"/>
<source>Add file resources</source>
<translation>添加多个文件资源</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5402"/>
+ <location filename="QScintilla/Editor.py" line="5420"/>
<source>Add aliased file resource</source>
<translation>添加别名文件资源</translation>
</message>
@@ -8188,42 +8188,42 @@
<translation type="obsolete">重命名文件 <b>%1</b>：</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5463"/>
+ <location filename="QScintilla/Editor.py" line="5481"/>
<source>Package Diagram</source>
<translation>程序包图</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5463"/>
+ <location filename="QScintilla/Editor.py" line="5481"/>
<source>Include class attributes?</source>
<translation>包含类属性？</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5480"/>
+ <location filename="QScintilla/Editor.py" line="5498"/>
<source>Imports Diagram</source>
<translation>引用图</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>从外部模块包含引用？</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5492"/>
+ <location filename="QScintilla/Editor.py" line="5510"/>
<source>Application Diagram</source>
<translation>应用程序图</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5492"/>
+ <location filename="QScintilla/Editor.py" line="5510"/>
<source>Include module names?</source>
<translation>包含模块名？</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5732"/>
+ <location filename="QScintilla/Editor.py" line="5750"/>
<source>Add to dictionary</source>
<translation>添加到文件夹</translation>
</message>
<message>
- <location filename="QScintilla/Editor.py" line="5734"/>
+ <location filename="QScintilla/Editor.py" line="5752"/>
<source>Ignore All</source>
<translation>全部忽略</translation>
</message>
@@ -8263,37 +8263,37 @@
<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="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="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="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"/>
+ <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="5402"/>
+ <location filename="QScintilla/Editor.py" line="5420"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
@@ -8318,12 +8318,12 @@
<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>
@@ -8333,25 +8333,45 @@
<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="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>
@@ -19784,12 +19804,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>
@@ -34936,29 +34956,29 @@
<translation>配置……</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="487"/>
+ <location filename="QScintilla/Shell.py" line="489"/>
<source>Select History</source>
<translation>选择历史</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>选择历史条目以执行（最常用的显示在最后）。</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="536"/>
+ <location filename="QScintilla/Shell.py" line="538"/>
<source>Passive Debug Mode</source>
<translation>被动调试模式</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="537"/>
+ <location filename="QScintilla/Shell.py" line="539"/>
<source>
Not connected</source>
<translation>
没有连接</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="539"/>
+ <location filename="QScintilla/Shell.py" line="541"/>
<source>No.</source>
<translation>No.</translation>
</message>
@@ -34985,7 +35005,7 @@
</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="1372"/>
+ <location filename="QScintilla/Shell.py" line="1374"/>
<source>Drop Error</source>
<translation>降落误差</translation>
</message>
@@ -35000,28 +35020,28 @@
<translation type="unfinished">剪切</translation>
</message>
<message>
- <location filename="QScintilla/Shell.py" line="541"/>
+ <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><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
