--- a/i18n/eric6_zh_CN.ts Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_zh_CN.ts Thu Jan 10 18:01:19 2019 +0100
@@ -5459,12 +5459,12 @@
<translation>改变</translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="792"/>
+ <location filename="../Debugger/DebugServer.py" line="794"/>
<source>Connection from illegal host</source>
<translation>连接非法主机</translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="1513"/>
+ <location filename="../Debugger/DebugServer.py" line="1515"/>
<source>
Not connected
</source>
@@ -5473,18 +5473,18 @@
</translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="792"/>
+ <location filename="../Debugger/DebugServer.py" line="794"/>
<source><p>A connection was attempted by the illegal host <b>{0}</b>. Accept this connection?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="1706"/>
+ <location filename="../Debugger/DebugServer.py" line="1708"/>
<source>Passive debug connection received
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="1720"/>
+ <location filename="../Debugger/DebugServer.py" line="1722"/>
<source>Passive debug connection closed
</source>
<translation type="unfinished"></translation>
@@ -5500,12 +5500,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="1338"/>
+ <location filename="../Debugger/DebugServer.py" line="1340"/>
<source>Start Debugger</source>
<translation type="unfinished">启动调试器</translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="1338"/>
+ <location filename="../Debugger/DebugServer.py" line="1340"/>
<source><p>The debugger type <b>{0}</b> is not supported or not configured.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -6686,47 +6686,47 @@
<context>
<name>DebuggerInterfacePython</name>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
<source>Start Debugger</source>
<translation>启动调试器</translation>
</message>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
<source><p>The debugger backend could not be started.</p></source>
<translation type="unfinished"><p>调试器后端无法启动。</p></translation>
</message>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
<source>Parent Process</source>
<translation>父进程</translation>
</message>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
<source>Child process</source>
<translation>子进程</translation>
</message>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
<source>Client forking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
<source>Select the fork branch to follow.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
<source>Debug Protocol Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
<source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+ <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
<source><p>No suitable {0} environment configured.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -13773,7 +13773,7 @@
<translation>改变背景颜色</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
<source>Various</source>
<translation>其它</translation>
</message>
@@ -13788,12 +13788,12 @@
<translation>显示空格</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
<source>Select to show a minimalistic context menu</source>
<translation>选择显示简化的上下文菜单</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
<source>Show minimal context menu</source>
<translation>显示最简上下文菜单</translation>
</message>
@@ -14233,12 +14233,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
<source>Select to hide the Format Buttons bar when formatting is not supported</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1915"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
<source>Hide Format Buttons bar when not supported</source>
<translation type="unfinished"></translation>
</message>
@@ -14278,6 +14278,46 @@
<source>Show Marker Map Right of the Editor</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+ <source>Shown Markers</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+ <source>Select to show change markers</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+ <source>Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+ <source>Select to show coverage markers</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+ <source>Coverage</source>
+ <translation type="unfinished">覆盖率</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+ <source>Select to show search markers</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+ <source>Search Markers</source>
+ <translation type="unfinished">搜索标记</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+ <source><b>Note</b>: Marker types not listed are always shown.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EditorSyntaxPage</name>
@@ -50297,17 +50337,17 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1711"/>
+ <location filename="../Preferences/__init__.py" line="1714"/>
<source>Export Preferences</source>
<translation>导出首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1739"/>
+ <location filename="../Preferences/__init__.py" line="1742"/>
<source>Import Preferences</source>
<translation>导入首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1739"/>
+ <location filename="../Preferences/__init__.py" line="1742"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>属性文件 (*.ini);;所有文件 (*)</translation>
</message>
@@ -61857,52 +61897,52 @@
<context>
<name>Shell</name>
<message>
- <location filename="../QScintilla/Shell.py" line="158"/>
+ <location filename="../QScintilla/Shell.py" line="160"/>
<source>Shell - Passive</source>
<translation>命令行 - 被动</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="160"/>
+ <location filename="../QScintilla/Shell.py" line="162"/>
<source>Shell</source>
<translation>命令行</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="278"/>
+ <location filename="../QScintilla/Shell.py" line="280"/>
<source>Passive >>> </source>
<translation>被动 >>></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="294"/>
+ <location filename="../QScintilla/Shell.py" line="296"/>
<source>Start</source>
<translation>开始</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="299"/>
- <source>History</source>
- <translation>历史</translation>
- </message>
- <message>
- <location filename="../QScintilla/Shell.py" line="300"/>
- <source>Select entry</source>
- <translation>选择条目</translation>
- </message>
- <message>
<location filename="../QScintilla/Shell.py" line="301"/>
+ <source>History</source>
+ <translation>历史</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Shell.py" line="302"/>
+ <source>Select entry</source>
+ <translation>选择条目</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Shell.py" line="303"/>
<source>Show</source>
<translation>显示</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="314"/>
+ <location filename="../QScintilla/Shell.py" line="316"/>
<source>Clear</source>
<translation>清除</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="307"/>
+ <location filename="../QScintilla/Shell.py" line="309"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="308"/>
+ <location filename="../QScintilla/Shell.py" line="310"/>
<source>Paste</source>
<translation>粘贴</translation>
</message>
@@ -61917,74 +61957,74 @@
<translation type="obsolete">重置并清除</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="322"/>
+ <location filename="../QScintilla/Shell.py" line="324"/>
<source>Configure...</source>
<translation>配置…</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="762"/>
+ <location filename="../QScintilla/Shell.py" line="764"/>
<source>Select History</source>
<translation>选择历史</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="762"/>
+ <location filename="../QScintilla/Shell.py" line="764"/>
<source>Select the history entry to execute (most recent shown last).</source>
<translation>选择历史条目以执行（最常用的显示在最后）。</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="830"/>
+ <location filename="../QScintilla/Shell.py" line="832"/>
<source>Passive Debug Mode</source>
<translation>被动调试模式</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="831"/>
+ <location filename="../QScintilla/Shell.py" line="833"/>
<source>
Not connected</source>
<translation>
没有连接</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="834"/>
+ <location filename="../QScintilla/Shell.py" line="836"/>
<source>No.</source>
<translation>No.</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2125"/>
+ <location filename="../QScintilla/Shell.py" line="2140"/>
<source>Drop Error</source>
<translation>降落误差</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="306"/>
+ <location filename="../QScintilla/Shell.py" line="308"/>
<source>Cut</source>
<translation>剪切</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="836"/>
+ <location filename="../QScintilla/Shell.py" line="838"/>
<source>{0} on {1}, {2}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1016"/>
+ <location filename="../QScintilla/Shell.py" line="1018"/>
<source>StdOut: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1024"/>
+ <location filename="../QScintilla/Shell.py" line="1026"/>
<source>StdErr: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2125"/>
+ <location filename="../QScintilla/Shell.py" line="2140"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"><p><b>{0}</b> 不是一个文件。</p></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="312"/>
+ <location filename="../QScintilla/Shell.py" line="314"/>
<source>Find</source>
<translation type="unfinished">查找</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="881"/>
+ <location filename="../QScintilla/Shell.py" line="883"/>
<source>Exception "{0}"
{1}
File: {2}, Line: {3}
@@ -61992,69 +62032,69 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="914"/>
- <source>Unspecified syntax error.
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../QScintilla/Shell.py" line="891"/>
- <source>Exception "{0}"
-{1}
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../QScintilla/Shell.py" line="916"/>
+ <source>Unspecified syntax error.
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Shell.py" line="893"/>
+ <source>Exception "{0}"
+{1}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Shell.py" line="918"/>
<source>Syntax error "{1}" in file {0} at line {2}, character {3}.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="939"/>
+ <location filename="../QScintilla/Shell.py" line="941"/>
<source>Signal "{0}" generated in file {1} at line {2}.
Function: {3}({4})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1989"/>
+ <location filename="../QScintilla/Shell.py" line="2000"/>
<source>Project</source>
<translation type="unfinished">项目</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="163"/>
+ <location filename="../QScintilla/Shell.py" line="165"/>
<source><b>The Shell Window</b><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'restart' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to start a shell for a virtual environment and should be followed by a virtual environment name. start' without a virtual environment name starts the default shell. Available virtual environments may be listed with the 'envs' or 'environments' commands. The active virtual environment can be questioned by the 'which' command. 'quit' or 'exit' is used to exit the application. These commands (except environments', 'envs' and 'which') are available through the window menus as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="190"/>
+ <location filename="../QScintilla/Shell.py" line="192"/>
<source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'restart' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to start a shell for a virtual environment and should be followed by a virtual environment name. start' without a virtual environment name starts the default shell. Available virtual environments may be listed with the 'envs' or 'environments' commands. The active virtual environment can be questioned by the 'which' command. These commands (except environments' and 'envs') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="315"/>
+ <location filename="../QScintilla/Shell.py" line="317"/>
<source>Restart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="316"/>
+ <location filename="../QScintilla/Shell.py" line="318"/>
<source>Restart and Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="320"/>
+ <location filename="../QScintilla/Shell.py" line="322"/>
<source>Active Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1813"/>
+ <location filename="../QScintilla/Shell.py" line="1823"/>
<source>Available Virtual Environments:
{0}
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1853"/>
+ <location filename="../QScintilla/Shell.py" line="1863"/>
<source>Current Virtual Environment: '{0}'
</source>
<translation type="unfinished"></translation>
@@ -86078,7 +86118,7 @@
<translation type="unfinished"><b>键盘快捷键</b><p>将程序的键盘快捷键设置成你喜欢的按键。</p></translation>
</message>
<message>
- <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+ <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
<source>Export Keyboard Shortcuts</source>
<translation type="unfinished">导出键盘快捷键</translation>
</message>
@@ -86098,7 +86138,7 @@
<translation type="unfinished"><b>导出键盘快捷键</b><p>导出程序的键盘快捷键。</p></translation>
</message>
<message>
- <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+ <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
<source>Import Keyboard Shortcuts</source>
<translation type="unfinished">导入键盘快捷键</translation>
</message>
@@ -86118,7 +86158,7 @@
<translation type="unfinished"><b>导入键盘快捷键</b><p>导入程序的键盘快捷键。</p></translation>
</message>
<message>
- <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+ <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
<source>Keyboard shortcut file (*.e4k)</source>
<translation type="unfinished">键盘快捷键文件 (*.e4k)</translation>
</message>
