--- a/i18n/eric6_zh_CN.GB2312.ts Tue Feb 24 18:31:14 2015 +0100 +++ b/i18n/eric6_zh_CN.GB2312.ts Tue Feb 24 18:55:07 2015 +0100 @@ -4135,7 +4135,7 @@ <translation>请在左边选择一个列表项以显示配置页面。</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="567"/> + <location filename="../Preferences/ConfigurationDialog.py" line="568"/> <source>Configuration Page Error</source> <translation>配置页面错误</translation> </message> @@ -4145,7 +4145,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="567"/> + <location filename="../Preferences/ConfigurationDialog.py" line="568"/> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -20755,100 +20755,90 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="89"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="111"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="114"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="117"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="131"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="134"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="137"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="104"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="104"/> <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="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="124"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="252"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="219"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="252"/> <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="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="236"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="95"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="143"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="144"/> <source><End></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="46"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="48"/> <source>Press to refresh the display</source> <translation type="unfinished"></translation> </message> @@ -50502,7 +50492,7 @@ <p>显示版本控制属性列表命令可能的错误消息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -50512,7 +50502,7 @@ <translation>无</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.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>