--- a/i18n/eric6_zh_CN.ts Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_zh_CN.ts Sat Jun 24 12:15:03 2017 +0200
@@ -4364,7 +4364,7 @@
<translation>点击比较两个文件</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="253"/>
+ <location filename="../UI/CompareDialog.py" line="262"/>
<source>Compare Files</source>
<translation>比较文件</translation>
</message>
@@ -4384,27 +4384,27 @@
<translation>同步水平滚动条(&S)</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="358"/>
+ <location filename="../UI/CompareDialog.py" line="369"/>
<source>Total: {0}</source>
<translation>总计：{0}</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="360"/>
+ <location filename="../UI/CompareDialog.py" line="371"/>
<source>Changed: {0}</source>
<translation>已更改：{0}</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="361"/>
+ <location filename="../UI/CompareDialog.py" line="372"/>
<source>Added: {0}</source>
<translation>已添加：{0}</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="362"/>
+ <location filename="../UI/CompareDialog.py" line="373"/>
<source>Deleted: {0}</source>
<translation>已删除：{0}</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="253"/>
+ <location filename="../UI/CompareDialog.py" line="262"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation><p>文件 <b>{0}</b> 无法读取。</p></translation>
</message>
@@ -4450,72 +4450,72 @@
<translation>CORBA</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
<source>Email</source>
<translation>电子邮件</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
<source>Graphics</source>
<translation>图形</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
<source>Icons</source>
<translation>图标</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
- <source>Network</source>
- <translation>网络</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
- <source>Plugin Manager</source>
- <translation>插件管理器</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+ <source>Network</source>
+ <translation>网络</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
+ <source>Plugin Manager</source>
+ <translation>插件管理器</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
<source>Printer</source>
<translation>打印机</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
<source>Python</source>
<translation>Python</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
- <source>Shell</source>
- <translation>命令行</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="191"/>
- <source>Tasks</source>
- <translation>任务</translation>
+ <source>Shell</source>
+ <translation>命令行</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+ <source>Tasks</source>
+ <translation>任务</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
<source>Templates</source>
<translation>模板</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
<source>Version Control Systems</source>
<translation>版本控制系统</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
<source>Debugger</source>
<translation>调试器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
<source>General</source>
<translation>通用配置</translation>
</message>
@@ -4525,153 +4525,153 @@
<translation type="obsolete">Ruby</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
<source>Editor</source>
<translation>编辑器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
- <source>APIs</source>
- <translation>API</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+ <source>APIs</source>
+ <translation>API</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
<source>Autocompletion</source>
<translation>自动完成</translation>
</message>
<message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+ <source>QScintilla</source>
+ <translation>QScintilla</translation>
+ </message>
+ <message>
<location filename="../Preferences/ConfigurationDialog.py" line="235"/>
- <source>QScintilla</source>
- <translation>QScintilla</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
<source>Calltips</source>
<translation>调用提示</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
<source>Filehandling</source>
<translation>文件处理</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
<source>Searching</source>
<translation>查找</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
<source>Spell checking</source>
<translation>拼写检查</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
<source>Style</source>
<translation>风格</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
- <source>Typing</source>
- <translation>键盘输入</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+ <source>Typing</source>
+ <translation>键盘输入</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
<source>Exporters</source>
<translation>输出器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
<source>Highlighters</source>
<translation>高亮功能</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
<source>Filetype Associations</source>
<translation>文件类型关联</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
<source>Styles</source>
<translation>风格</translation>
</message>
<message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
+ <source>Properties</source>
+ <translation>属性</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
+ <source>Help</source>
+ <translation>帮助</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
+ <source>Help Documentation</source>
+ <translation>帮助文档</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
+ <source>Help Viewers</source>
+ <translation>帮助浏览器</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+ <source>Project</source>
+ <translation>项目</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
+ <source>Project Viewer</source>
+ <translation>项目浏览器</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
+ <source>Multiproject</source>
+ <translation>多重项目</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
+ <source>Interface</source>
+ <translation>界面</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
+ <source>Viewmanager</source>
+ <translation>视图管理器</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
+ <source>Appearance</source>
+ <translation>外观</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
+ <source>Preferences</source>
+ <translation>首选项</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
+ <source>Please select an entry of the list
+to display the configuration page.</source>
+ <translation>请在左边选择一个列表项以显示配置页面。</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
+ <source>Configuration Page Error</source>
+ <translation>配置页面错误</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
+ <source>Python3</source>
+ <translation>Python3</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
+ <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source>
+ <translation><p>配置页面 <b>{0}</b> 无法载入。</p></translation>
+ </message>
+ <message>
<location filename="../Preferences/ConfigurationDialog.py" line="280"/>
- <source>Properties</source>
- <translation>属性</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
- <source>Help</source>
- <translation>帮助</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
- <source>Help Documentation</source>
- <translation>帮助文档</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
- <source>Help Viewers</source>
- <translation>帮助浏览器</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
- <source>Project</source>
- <translation>项目</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
- <source>Project Viewer</source>
- <translation>项目浏览器</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
- <source>Multiproject</source>
- <translation>多重项目</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
- <source>Interface</source>
- <translation>界面</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
- <source>Viewmanager</source>
- <translation>视图管理器</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
- <source>Appearance</source>
- <translation>外观</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
- <source>Preferences</source>
- <translation>首选项</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
- <source>Please select an entry of the list
-to display the configuration page.</source>
- <translation>请在左边选择一个列表项以显示配置页面。</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
- <source>Configuration Page Error</source>
- <translation>配置页面错误</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
- <source>Python3</source>
- <translation>Python3</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
- <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source>
- <translation><p>配置页面 <b>{0}</b> 无法载入。</p></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
<source>Keywords</source>
<translation type="unfinished"></translation>
</message>
@@ -4681,75 +4681,80 @@
<translation>协作</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
<source>Tray Starter</source>
<translation>托盘启动器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
<source>VirusTotal Interface</source>
<translation>VirusTotal 界面</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
<source>Security</source>
<translation>安全</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
<source>Notifications</source>
<translation>通知</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
- <source>IRC</source>
- <translation>IRC</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
- <source>Code Checkers</source>
- <translation>代码检查器</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
- <source>eric6 Web Browser</source>
- <translation>eric6 网页浏览器</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="159"/>
- <source>Log-Viewer</source>
- <translation>日志浏览器</translation>
+ <source>IRC</source>
+ <translation>IRC</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+ <source>Code Checkers</source>
+ <translation>代码检查器</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+ <source>eric6 Web Browser</source>
+ <translation>eric6 网页浏览器</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+ <source>Log-Viewer</source>
+ <translation>日志浏览器</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
<source>Mimetypes</source>
<translation>MIME 类型</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
<source>Enter search text...</source>
<translation>输入搜索内容…</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
<source>Mouse Click Handlers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
<source>Flash Cookie Manager</source>
<translation>Flash Cookie 管理器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
<source>Hex Editor</source>
<translation type="unfinished">十六进制编辑器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
<source>Web Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+ <source>Diff</source>
+ <translation type="unfinished">差异</translation>
+ </message>
</context>
<context>
<name>Connection</name>
@@ -7313,6 +7318,114 @@
</message>
</context>
<context>
+ <name>DiffColoursPage</name>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+ <source><b>Configure Diff colours</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+ <source>Select the background colour for header lines</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+ <source>Header Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+ <source>Header Line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+ <source>Select the background colour for bad whitespace</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+ <source>Whitespace Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+ <source>Select the text foreground colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+ <source>Text Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+ <source>Normal Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+ <source>Select the background colour for additions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+ <source>Added Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+ <source>Added Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+ <source>Select the background colour for removed text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+ <source>Removed Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+ <source>Removed Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+ <source>Select the background colour for replaced text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+ <source>Replaced Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+ <source>Replaced Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+ <source>Select the background colour for context lines</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+ <source>Context Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+ <source>Context Line</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>DiffDialog</name>
<message>
<location filename="../UI/DiffDialog.ui" line="14"/>
@@ -7410,7 +7523,7 @@
<translation>比较文件</translation>
</message>
<message>
- <location filename="../UI/DiffDialog.py" line="447"/>
+ <location filename="../UI/DiffDialog.py" line="448"/>
<source>There is no difference.</source>
<translation>没有差异。</translation>
</message>
@@ -24201,52 +24314,52 @@
<translation type="obsolete">Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
<source>Process Generation Error</source>
<translation type="unfinished">进程生成错误</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
<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/HgDiffDialog.py" line="126"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
<source>There is no difference.</source>
<translation type="unfinished">没有差异。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
<source>Save Diff</source>
<translation type="unfinished">保存差异</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
<source>Patch Files (*.diff)</source>
<translation type="unfinished">补丁文件 (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
<source>Patch Contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
- <source><Start></source>
- <translation type="unfinished"><开始></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+ <source><Start></source>
+ <translation type="unfinished"><开始></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
<source><End></source>
<translation type="unfinished"><结束></translation>
</message>
@@ -25667,37 +25780,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
<source>Differences to Parent {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
<source>Diff to Parent {0}{1}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
<source>There is no difference.</source>
<translation type="unfinished">没有差异。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
<source>Save Diff</source>
<translation type="unfinished">保存差异</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
<source>Patch Files (*.diff)</source>
<translation type="unfinished">补丁文件 (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation>
</message>
@@ -40691,27 +40804,27 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1552"/>
+ <location filename="../Preferences/__init__.py" line="1563"/>
<source>Export Preferences</source>
<translation>导出首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1580"/>
+ <location filename="../Preferences/__init__.py" line="1591"/>
<source>Import Preferences</source>
<translation>导入首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1580"/>
+ <location filename="../Preferences/__init__.py" line="1591"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>属性文件 (*.ini);;所有文件 (*)</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1682"/>
+ <location filename="../Preferences/__init__.py" line="1693"/>
<source>Select Python{0} Interpreter</source>
<translation>选择 Python{0} 解释器</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1682"/>
+ <location filename="../Preferences/__init__.py" line="1693"/>
<source>Select the Python{0} interpreter to be used:</source>
<translation>选择要使用的 Python{0} 解释器：</translation>
</message>
@@ -54993,7 +55106,7 @@
<context>
<name>SvnDiffDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
<source>Subversion Diff</source>
<translation>Subversion 差异</translation>
</message>
@@ -55053,59 +55166,59 @@
<translation>Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
<source>Process Generation Error</source>
<translation>进程生成错误</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
<source>There is no difference.</source>
<translation>没有差异。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
<source>Save Diff</source>
<translation>保存差异</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
<source>Patch Files (*.diff)</source>
<translation>补丁文件 (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
<source>There is no temporary directory available.</source>
<translation>无可用临时文件夹。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
<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/SvnDiffDialog.py" line="405"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
<source><p>The patch 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="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
<source>Processing file '{0}'...
</source>
<translation>正在处理文件 {0}…
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
- <source><Start></source>
- <translation><开始></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+ <source><Start></source>
+ <translation><开始></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
<source><End></source>
<translation><结束></translation>
</message>
