--- a/i18n/eric5_zh_CN.GB2312.ts Wed Apr 24 19:44:41 2013 +0200
+++ b/i18n/eric5_zh_CN.GB2312.ts Wed Apr 24 20:01:41 2013 +0200
@@ -2589,7 +2589,7 @@
<context>
<name>BrowserModel</name>
<message>
- <location filename="UI/BrowserModel.py" line="44"/>
+ <location filename="UI/BrowserModel.py" line="51"/>
<source>Name</source>
<translation>名称</translation>
</message>
@@ -2599,12 +2599,12 @@
<translation type="obsolete">代码：%1</translation>
</message>
<message>
- <location filename="UI/BrowserModel.py" line="561"/>
+ <location filename="UI/BrowserModel.py" line="563"/>
<source>Globals</source>
<translation>全局</translation>
</message>
<message>
- <location filename="UI/BrowserModel.py" line="602"/>
+ <location filename="UI/BrowserModel.py" line="604"/>
<source>Attributes</source>
<translation>属性</translation>
</message>
@@ -2614,12 +2614,12 @@
<translation type="obsolete">属性（全局）</translation>
</message>
<message>
- <location filename="UI/BrowserModel.py" line="556"/>
+ <location filename="UI/BrowserModel.py" line="558"/>
<source>Coding: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="UI/BrowserModel.py" line="612"/>
+ <location filename="UI/BrowserModel.py" line="614"/>
<source>Class Attributes</source>
<translation type="unfinished"></translation>
</message>
@@ -3259,7 +3259,7 @@
<translation type="obsolete">给定文本编码 '%1' 错误。</translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="94"/>
+ <location filename="Utilities/__init__.py" line="96"/>
<source>The coding '{0}' is wrong for the given text.</source>
<translation type="unfinished"></translation>
</message>
@@ -13730,27 +13730,27 @@
<translation type="obsolete"><b>生成文档</b><p>使用 eric4-doc 生成 API 文档。</p> {5-?}</translation>
</message>
<message>
- <location filename="Plugins/PluginEricdoc.py" line="132"/>
+ <location filename="Plugins/PluginEricdoc.py" line="130"/>
<source>Generate documentation (eric5_doc)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/PluginEricdoc.py" line="132"/>
+ <location filename="Plugins/PluginEricdoc.py" line="130"/>
<source>Generate &documentation (eric5_doc)</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="Plugins/PluginEricdoc.py" line="133"/>
+ <source>Generate API documentation using eric5_doc</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="Plugins/PluginEricdoc.py" line="135"/>
- <source>Generate API documentation using eric5_doc</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/PluginEricdoc.py" line="137"/>
<source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/PluginEricdoc.py" line="88"/>
+ <location filename="Plugins/PluginEricdoc.py" line="86"/>
<source>Qt Help Tools</source>
<translation type="unfinished"></translation>
</message>
@@ -24717,7 +24717,7 @@
<translation type="unfinished">提交</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/>
<source>There are no uncommitted changes available/selected.</source>
<translation type="unfinished">没有未提交的更改可用或被选择。</translation>
</message>
@@ -24732,7 +24732,7 @@
<translation type="unfinished">没有未版本化的条目可用或被选择。</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/>
<source>Revert</source>
<translation type="unfinished">还原</translation>
</message>
@@ -24747,7 +24747,7 @@
<translation type="unfinished">移除</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/>
<source>There are no missing entries available/selected.</source>
<translation type="unfinished"></translation>
</message>
@@ -24842,7 +24842,7 @@
<translation type="obsolete">差异</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
@@ -34784,27 +34784,27 @@
<context>
<name>Preferences</name>
<message>
- <location filename="Preferences/__init__.py" line="1132"/>
+ <location filename="Preferences/__init__.py" line="1131"/>
<source>Export Preferences</source>
<translation>导出首选项</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1159"/>
+ <location filename="Preferences/__init__.py" line="1158"/>
<source>Import Preferences</source>
<translation>导入首选项</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1159"/>
+ <location filename="Preferences/__init__.py" line="1158"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1253"/>
+ <location filename="Preferences/__init__.py" line="1252"/>
<source>Select Python2 Interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1253"/>
+ <location filename="Preferences/__init__.py" line="1252"/>
<source>Select the Python2 interpreter to be used:</source>
<translation type="unfinished"></translation>
</message>
@@ -41722,7 +41722,7 @@
<translation type="obsolete">点击通过文件夹选择对话框选择 Qt3 文件夹</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/>
<source>...</source>
<translation>……</translation>
</message>
@@ -41747,7 +41747,7 @@
<translation type="obsolete"><b>注意：</b> 为空则使用 QT4TRANSLATIONSDIR 环境变量或者编译到 Qt4 库中的路径。</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/>
<source>Qt Tools</source>
<translation>Qt 工具</translation>
</message>
@@ -41797,12 +41797,12 @@
<translation type="obsolete">输入 Qt4 工具名称的后缀</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/>
<source>This gives an example of the complete tool name</source>
<translation>这里给出了完整工具名称的一个范例</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/>
<source>designer</source>
<translation>设计师</translation>
</message>
@@ -41812,7 +41812,7 @@
<translation type="obsolete">选择 Qt3 文件夹</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/>
<source>Select Qt4 Translations Directory</source>
<translation>选择 Qt4 翻译文件夹</translation>
</message>
@@ -41827,7 +41827,7 @@
<translation type="obsolete">Qt3 文件夹 {4 ?}</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/>
<source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source>
<translation type="unfinished"><font color="#FF0000"><b>注意：</b> 该设置将在下次启动应用程序时生效。</font></translation>
</message>
@@ -41844,65 +41844,50 @@
<message>
<location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/>
<source>Select Qt4 Directory</source>
- <translation type="unfinished">选择 Qt3 文件夹 {4 ?}</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/>
+ <translation type="obsolete">选择 Qt3 文件夹 {4 ?}</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/>
<source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/>
- <source>Qt Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/>
- <source>Enter the path of the Qt directory.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/>
- <source>Press to select the Qt directory via a directory selection dialog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/>
<source>Qt Translations Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/>
<source>Press to select the Qt translations directory via a directory selection dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/>
<source>Enter the path of the Qt translations directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/>
<source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/>
<source>Qt-Prefix:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/>
<source>Enter the prefix for the Qt tools name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/>
<source>Qt-Postfix:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/>
<source>Enter the postfix for the Qt tools name</source>
<translation type="unfinished"></translation>
</message>
@@ -49726,17 +49711,17 @@
<translation>添加更改列表</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/>
<source>Remove from Changelist</source>
<translation>从更改列表中移除</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/>
<source>Lock</source>
<translation>闭锁</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/>
<source>Unlock</source>
<translation>解锁</translation>
</message>
@@ -49861,7 +49846,7 @@
<translation>提交</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/>
<source>There are no uncommitted changes available/selected.</source>
<translation>没有未提交的更改可用或被选择。</translation>
</message>
@@ -49876,37 +49861,37 @@
<translation>没有未版本化的条目可用或被选择。</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/>
<source>Revert</source>
<translation>还原</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/>
<source>There are no unlocked files available/selected.</source>
<translation>没有未解锁的文件可用或被选择。</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/>
<source>There are no locked files available/selected.</source>
<translation>没有闭锁的文件可用或被选择。</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/>
<source>Break Lock</source>
<translation>Break Lock</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/>
<source>Steal Lock</source>
<translation>Steal Lock</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/>
<source>There are no files available/selected not belonging to a changelist.</source>
<translation>没有不属于更改列表的文件可用或被选择。</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/>
<source>There are no files available/selected belonging to a changelist.</source>
<translation>没有属于更改列表的文件可用或被选择。</translation>
</message>
@@ -49996,7 +49981,7 @@
<translation type="obsolete">差异</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
@@ -50006,7 +49991,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/>
<source>There are no missing entries available/selected.</source>
<translation type="unfinished"></translation>
</message>
@@ -58832,17 +58817,17 @@
<context>
<name>Utilities</name>
<message>
- <location filename="Utilities/__init__.py" line="1145"/>
+ <location filename="Utilities/__init__.py" line="1147"/>
<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>
<message>
- <location filename="Utilities/__init__.py" line="1345"/>
+ <location filename="Utilities/__init__.py" line="1337"/>
<source>Python2 interpreter not configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1395"/>
+ <location filename="Utilities/__init__.py" line="1387"/>
<source>Python2 interpreter did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
@@ -63726,12 +63711,12 @@
<translation type="obsolete">正在导入程序包……</translation>
</message>
<message>
- <location filename="eric5.py" line="253"/>
+ <location filename="eric5.py" line="250"/>
<source>Generating Main Window...</source>
<translation type="unfinished">正在产生主窗口……</translation>
</message>
<message>
- <location filename="eric5.py" line="248"/>
+ <location filename="eric5.py" line="245"/>
<source>Starting...</source>
<translation type="unfinished"></translation>
</message>
