--- a/i18n/eric6_zh_CN.ts Sat Jan 28 12:39:43 2017 +0100 +++ b/i18n/eric6_zh_CN.ts Sat Jan 28 14:22:00 2017 +0100 @@ -9274,7 +9274,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>打开文件</translation> </message> @@ -9359,7 +9359,7 @@ <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>正在进行拼写检查…</translation> </message> @@ -9594,7 +9594,7 @@ <translation>编辑断点…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5159"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> @@ -9679,257 +9679,257 @@ <translation>选择要应用的 Pygments 词法分析器。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>只读文件的改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1755"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>试图改变只读文件。请先保存到另一个文件中。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2446"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>打印中…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2463"/> - <source>Printing completed</source> - <translation>打印已完成</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>打印已完成</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> <source>Error while printing</source> <translation>打印时出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2468"/> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>打印失败</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>保存文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4432"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>自动完成无效,没有设定自动完成源。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5162"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5536"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5592"/> + <location filename="../QScintilla/Editor.py" line="5594"/> <source>All lines have been covered.</source> <translation>所有行均被已覆盖。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5599"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5714"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5874"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>选择一个宏名称:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6260"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>保存宏</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>保存宏出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>开始宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6332"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>输入宏名称:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6470"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6795"/> - <source>Resources</source> - <translation>资源</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6797"/> - <source>Add file...</source> - <translation>添加文件…</translation> + <source>Resources</source> + <translation>资源</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add files...</source> + <source>Add file...</source> <translation>添加文件…</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>添加文件…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6803"/> <source>Add aliased file...</source> <translation>添加别名文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6804"/> + <location filename="../QScintilla/Editor.py" line="6806"/> <source>Add localized resource...</source> <translation>添加本地资源…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6808"/> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6827"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6935"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>包含类属性?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6955"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6969"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>包含模块名?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7250"/> - <source>Add to dictionary</source> - <translation>添加到文件夹</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7252"/> + <source>Add to dictionary</source> + <translation>添加到文件夹</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> @@ -9954,47 +9954,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2826"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>文件 <b>{0}</b> 有未保存的更改。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2881"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>文件 <b>{0}</b> 无法打开。</p><p>原因:{1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2985"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>文件 <b>{0}</b> 无法保存。<br />原因:{1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6231"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <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="6240"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <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="6634"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0}(只读)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6774"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6871"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -10019,47 +10019,47 @@ <translation>清空警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3044"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6277"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>宏文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6128"/> + <location filename="../QScintilla/Editor.py" line="6130"/> <source>Warning: {0}</source> <translation>警告:{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6135"/> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation>错误:{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>警告:</b>您在重新打开时将丢失所有更改。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4537"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <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="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4857"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -10084,27 +10084,27 @@ <translation>上一个更改</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7664"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6064"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6125"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -10129,7 +10129,7 @@ <translation>使用指定编码重新打开</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -10144,32 +10144,32 @@ <translation>补全</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4586"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4900"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7751"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -24846,17 +24846,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -24911,112 +24911,112 @@ <translation type="unfinished">输入要提取条目的限制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="326"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished">选择在复制或移动时停止列出日志消息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="329"/> <source>Stop on Copy/Move</source> <translation type="unfinished">复制或移动时停止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> <source>Press to compare two revisions</source> <translation type="unfinished">点击比较两次修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="392"/> <source>&Compare Revisions</source> <translation type="unfinished">比较修订(&C)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="459"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="475"/> <source>Input</source> <translation type="unfinished">输入</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> - <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="483"/> - <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="490"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> - <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="503"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="510"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="517"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="520"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="523"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source>Added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> <source>Deleted</source> <translation type="unfinished">已删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">hg 进程没有在 30 秒内结束。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="683"/> <source>Could not start the hg executable.</source> <translation type="unfinished">无法启动 hg 可执行程序。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="686"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -25026,22 +25026,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="379"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="382"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> @@ -25056,7 +25056,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> <source>All</source> <translation type="unfinished">全部</translation> </message> @@ -25071,17 +25071,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -25091,83 +25091,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> - <source><b>Change Phase</b> -<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1752"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> - <source>Show differences side-by-side</source> - <translation type="unfinished">并排显示差异</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> - <source>Select action from menu</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="193"/> - <source>Copy the selected changesets to the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="205"/> - <source>Tag</source> - <translation type="unfinished">标签</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1804"/> - <source>Switch</source> - <translation type="unfinished">转换</translation> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1795"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="435"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="438"/> + <source>Show differences side-by-side</source> + <translation type="unfinished">并排显示差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <source>Tag</source> + <translation type="unfinished">标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="216"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="996"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1004"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -25192,155 +25192,165 @@ <translation type="unfinished">点击查找下一次出现</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished">查找</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished">过滤器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2088"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished">文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="172"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1945"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="255"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1926"/> + <source>Fetch Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1987"/> + <source>Strip Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> - <source>Push All Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="256"/> - <source>Push all changes to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1883"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/> - <source>Strip Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> - <source>Define Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/> - <source>Bookmark the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> - <source>Move Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> + <source>Define Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <source>Bookmark the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="231"/> + <source>Move Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1868"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1890"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1833"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -54445,17 +54455,17 @@ <translation>选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="643"/> <source>Revision</source> <translation>修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="640"/> <source>Author</source> <translation>作者</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="150"/> <source>Message</source> <translation>消息</translation> </message> @@ -54515,120 +54525,130 @@ <translation>复制或移动时停止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>点击生成与上一次修订的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>与上一次的差异(&D)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>点击比较两次修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>比较修订(&C)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion 日志错误</b><p>显示 svn log 命令可能的错误消息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>输入</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>点击将输入发送到 subversion 进程</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>发送(&S)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>输入要发送到 subversion 进程的数据</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>选择将输入区域转换成密码模式</translation> + <source>Press to send the input to the subversion process</source> + <translation>点击将输入发送到 subversion 进程</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>密码模式(&P)</translation> + <source>&Send</source> + <translation>发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>输入要发送到 subversion 进程的数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>已删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Subversion 错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="298"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation>并排显示差异</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name>