--- a/i18n/eric5_zh_CN.GB2312.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Mar 31 19:15:17 2012 +0200 @@ -19273,37 +19273,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <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/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -19313,12 +19313,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -20251,102 +20251,102 @@ <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <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/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -36490,55 +36490,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation type="unfinished">1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation type="unfinished">添加……</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">添加……</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation type="unfinished">移除</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">移除</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -41313,7 +41333,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -41323,7 +41343,7 @@ <translation type="obsolete">无法启动进程 %1,在搜索路径中。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -41615,7 +41635,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -41644,7 +41664,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -41757,7 +41777,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -41804,7 +41824,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -42111,12 +42131,12 @@ <translation>选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>作者</translation> </message> @@ -42271,7 +42291,7 @@ <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -42281,7 +42301,7 @@ <translation type="obsolete">无法启动进程 %1,在搜索路径中。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -43843,7 +43863,7 @@ <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -43853,7 +43873,7 @@ <translation type="obsolete">无法启动进程 %1,在搜索路径中。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -44236,7 +44256,7 @@ <translation>是</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -44301,7 +44321,7 @@ <translation>没有属于更改列表的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -44617,7 +44637,7 @@ <translation>储存库 URL 为空。终止……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -44632,7 +44652,7 @@ <translation>已安装的 PySvn 版本应为 1.4.0 或更高。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message>