Updated translations and source docu for the shell changes.

Mon, 10 Jul 2017 18:48:33 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 10 Jul 2017 18:48:33 +0200
changeset 5800
c3379bf35654
parent 5799
e87f52c0374a
child 5801
d3548bec88d1

Updated translations and source docu for the shell changes.

- added support for dfferent history navigation styles (disabled, Linux, Windows)
- improved shell history dialog

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
APIs/Python3/eric6.bas file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.Shell.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.ShellHistoryDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.ShellWindow.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.WebBrowserView.html file | annotate | diff | comparison | revisions
QScintilla/Shell.py file | annotate | diff | comparison | revisions
changelog file | annotate | diff | comparison | revisions
i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
i18n/eric6_de.qm file | annotate | diff | comparison | revisions
i18n/eric6_de.ts file | annotate | diff | comparison | revisions
i18n/eric6_empty.ts file | annotate | diff | comparison | revisions
i18n/eric6_en.ts file | annotate | diff | comparison | revisions
i18n/eric6_es.ts file | annotate | diff | comparison | revisions
i18n/eric6_fr.ts file | annotate | diff | comparison | revisions
i18n/eric6_it.ts file | annotate | diff | comparison | revisions
i18n/eric6_pt.ts file | annotate | diff | comparison | revisions
i18n/eric6_ru.ts file | annotate | diff | comparison | revisions
i18n/eric6_tr.ts file | annotate | diff | comparison | revisions
i18n/eric6_zh_CN.ts file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Mon Jul 10 18:24:35 2017 +0200
+++ b/APIs/Python3/eric6.api	Mon Jul 10 18:48:33 2017 +0200
@@ -8169,15 +8169,19 @@
 eric6.QScintilla.Shell.Shell.dropEvent?4(event)
 eric6.QScintilla.Shell.Shell.editorCommand?4(cmd)
 eric6.QScintilla.Shell.Shell.event?4(evt)
-eric6.QScintilla.Shell.Shell.executeLines?4(lines)
+eric6.QScintilla.Shell.Shell.executeLines?4(lines, historyIndex=None)
 eric6.QScintilla.Shell.Shell.focusInEvent?4(event)
 eric6.QScintilla.Shell.Shell.focusNextPrevChild?4(nextChild)
 eric6.QScintilla.Shell.Shell.focusOutEvent?4(event)
 eric6.QScintilla.Shell.Shell.gestureEvent?4(evt)
 eric6.QScintilla.Shell.Shell.getClientType?4()
 eric6.QScintilla.Shell.Shell.getHistory?4(clientType)
+eric6.QScintilla.Shell.Shell.getHistoryIndex?4()
 eric6.QScintilla.Shell.Shell.handlePreferencesChanged?4()
+eric6.QScintilla.Shell.Shell.historyStyle?4()
+eric6.QScintilla.Shell.Shell.historyStyleChanged?7
 eric6.QScintilla.Shell.Shell.insert?4(txt)
+eric6.QScintilla.Shell.Shell.isHistoryEnabled?4()
 eric6.QScintilla.Shell.Shell.keyPressEvent?4(ev)
 eric6.QScintilla.Shell.Shell.loadHistory?4(clientType)
 eric6.QScintilla.Shell.Shell.mousePressEvent?4(event)
@@ -8195,6 +8199,9 @@
 eric6.QScintilla.Shell.ShellAssembly.shell?4()
 eric6.QScintilla.Shell.ShellAssembly.showFind?4(txt="")
 eric6.QScintilla.Shell.ShellAssembly?1(dbs, vm, horizontal=True, parent=None)
+eric6.QScintilla.Shell.ShellHistoryStyle.Disabled?7
+eric6.QScintilla.Shell.ShellHistoryStyle.LinuxStyle?7
+eric6.QScintilla.Shell.ShellHistoryStyle.WindowsStyle?7
 eric6.QScintilla.ShellHistoryDialog.ShellHistoryDialog.getHistory?4()
 eric6.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_copyButton_clicked?4()
 eric6.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_deleteButton_clicked?4()
--- a/APIs/Python3/eric6.bas	Mon Jul 10 18:24:35 2017 +0200
+++ b/APIs/Python3/eric6.bas	Mon Jul 10 18:48:33 2017 +0200
@@ -697,6 +697,7 @@
 Shell QsciScintillaCompat
 ShellAssembly QWidget
 ShellHistoryDialog QDialog Ui_ShellHistoryDialog
+ShellHistoryStyle Enum
 ShellPage ConfigurationPageBase Ui_ShellPage
 ShellWindow E5MainWindow
 Shelve HgExtension
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Mon Jul 10 18:24:35 2017 +0200
+++ b/Documentation/Help/source.qhp	Mon Jul 10 18:48:33 2017 +0200
@@ -12485,6 +12485,7 @@
       <keyword name="Shell (Constructor)" id="Shell (Constructor)" ref="eric6.QScintilla.Shell.html#Shell.__init__" />
       <keyword name="Shell (Module)" id="Shell (Module)" ref="eric6.QScintilla.Shell.html" />
       <keyword name="Shell.__QScintillaAutoCompletionCommand" id="Shell.__QScintillaAutoCompletionCommand" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaAutoCompletionCommand" />
+      <keyword name="Shell.__QScintillaCancel" id="Shell.__QScintillaCancel" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaCancel" />
       <keyword name="Shell.__QScintillaCharLeft" id="Shell.__QScintillaCharLeft" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaCharLeft" />
       <keyword name="Shell.__QScintillaCharLeftExtend" id="Shell.__QScintillaCharLeftExtend" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaCharLeftExtend" />
       <keyword name="Shell.__QScintillaCharRight" id="Shell.__QScintillaCharRight" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaCharRight" />
@@ -12499,7 +12500,9 @@
       <keyword name="Shell.__QScintillaHistoryUp" id="Shell.__QScintillaHistoryUp" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaHistoryUp" />
       <keyword name="Shell.__QScintillaLeftCommand" id="Shell.__QScintillaLeftCommand" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaLeftCommand" />
       <keyword name="Shell.__QScintillaLeftDeleteCommand" id="Shell.__QScintillaLeftDeleteCommand" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaLeftDeleteCommand" />
+      <keyword name="Shell.__QScintillaLineDown" id="Shell.__QScintillaLineDown" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaLineDown" />
       <keyword name="Shell.__QScintillaLineEnd" id="Shell.__QScintillaLineEnd" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaLineEnd" />
+      <keyword name="Shell.__QScintillaLineUp" id="Shell.__QScintillaLineUp" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaLineUp" />
       <keyword name="Shell.__QScintillaNewline" id="Shell.__QScintillaNewline" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaNewline" />
       <keyword name="Shell.__QScintillaRightCommand" id="Shell.__QScintillaRightCommand" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaRightCommand" />
       <keyword name="Shell.__QScintillaTab" id="Shell.__QScintillaTab" ref="eric6.QScintilla.Shell.html#Shell.__QScintillaTab" />
@@ -12528,10 +12531,12 @@
       <keyword name="Shell.__insertTextAtEnd" id="Shell.__insertTextAtEnd" ref="eric6.QScintilla.Shell.html#Shell.__insertTextAtEnd" />
       <keyword name="Shell.__insertTextNoEcho" id="Shell.__insertTextNoEcho" ref="eric6.QScintilla.Shell.html#Shell.__insertTextNoEcho" />
       <keyword name="Shell.__isCursorOnLastLine" id="Shell.__isCursorOnLastLine" ref="eric6.QScintilla.Shell.html#Shell.__isCursorOnLastLine" />
+      <keyword name="Shell.__isHistoryIndexValid" id="Shell.__isHistoryIndexValid" ref="eric6.QScintilla.Shell.html#Shell.__isHistoryIndexValid" />
       <keyword name="Shell.__middleMouseButton" id="Shell.__middleMouseButton" ref="eric6.QScintilla.Shell.html#Shell.__middleMouseButton" />
       <keyword name="Shell.__raw_input" id="Shell.__raw_input" ref="eric6.QScintilla.Shell.html#Shell.__raw_input" />
       <keyword name="Shell.__reset" id="Shell.__reset" ref="eric6.QScintilla.Shell.html#Shell.__reset" />
       <keyword name="Shell.__resetAndClear" id="Shell.__resetAndClear" ref="eric6.QScintilla.Shell.html#Shell.__resetAndClear" />
+      <keyword name="Shell.__resetIncrementalHistorySearch" id="Shell.__resetIncrementalHistorySearch" ref="eric6.QScintilla.Shell.html#Shell.__resetIncrementalHistorySearch" />
       <keyword name="Shell.__resizeLinenoMargin" id="Shell.__resizeLinenoMargin" ref="eric6.QScintilla.Shell.html#Shell.__resizeLinenoMargin" />
       <keyword name="Shell.__rsearchHistory" id="Shell.__rsearchHistory" ref="eric6.QScintilla.Shell.html#Shell.__rsearchHistory" />
       <keyword name="Shell.__searchHistory" id="Shell.__searchHistory" ref="eric6.QScintilla.Shell.html#Shell.__searchHistory" />
@@ -12539,9 +12544,11 @@
       <keyword name="Shell.__searchPrev" id="Shell.__searchPrev" ref="eric6.QScintilla.Shell.html#Shell.__searchPrev" />
       <keyword name="Shell.__setAutoCompletion" id="Shell.__setAutoCompletion" ref="eric6.QScintilla.Shell.html#Shell.__setAutoCompletion" />
       <keyword name="Shell.__setCallTips" id="Shell.__setCallTips" ref="eric6.QScintilla.Shell.html#Shell.__setCallTips" />
+      <keyword name="Shell.__setHistoryIndex" id="Shell.__setHistoryIndex" ref="eric6.QScintilla.Shell.html#Shell.__setHistoryIndex" />
       <keyword name="Shell.__setMargin0" id="Shell.__setMargin0" ref="eric6.QScintilla.Shell.html#Shell.__setMargin0" />
       <keyword name="Shell.__setMonospaced" id="Shell.__setMonospaced" ref="eric6.QScintilla.Shell.html#Shell.__setMonospaced" />
       <keyword name="Shell.__setTextDisplay" id="Shell.__setTextDisplay" ref="eric6.QScintilla.Shell.html#Shell.__setTextDisplay" />
+      <keyword name="Shell.__setupCursorKeys" id="Shell.__setupCursorKeys" ref="eric6.QScintilla.Shell.html#Shell.__setupCursorKeys" />
       <keyword name="Shell.__showCompletions" id="Shell.__showCompletions" ref="eric6.QScintilla.Shell.html#Shell.__showCompletions" />
       <keyword name="Shell.__showLanguageMenu" id="Shell.__showLanguageMenu" ref="eric6.QScintilla.Shell.html#Shell.__showLanguageMenu" />
       <keyword name="Shell.__startDebugClient" id="Shell.__startDebugClient" ref="eric6.QScintilla.Shell.html#Shell.__startDebugClient" />
@@ -12569,8 +12576,11 @@
       <keyword name="Shell.gestureEvent" id="Shell.gestureEvent" ref="eric6.QScintilla.Shell.html#Shell.gestureEvent" />
       <keyword name="Shell.getClientType" id="Shell.getClientType" ref="eric6.QScintilla.Shell.html#Shell.getClientType" />
       <keyword name="Shell.getHistory" id="Shell.getHistory" ref="eric6.QScintilla.Shell.html#Shell.getHistory" />
+      <keyword name="Shell.getHistoryIndex" id="Shell.getHistoryIndex" ref="eric6.QScintilla.Shell.html#Shell.getHistoryIndex" />
       <keyword name="Shell.handlePreferencesChanged" id="Shell.handlePreferencesChanged" ref="eric6.QScintilla.Shell.html#Shell.handlePreferencesChanged" />
+      <keyword name="Shell.historyStyle" id="Shell.historyStyle" ref="eric6.QScintilla.Shell.html#Shell.historyStyle" />
       <keyword name="Shell.insert" id="Shell.insert" ref="eric6.QScintilla.Shell.html#Shell.insert" />
+      <keyword name="Shell.isHistoryEnabled" id="Shell.isHistoryEnabled" ref="eric6.QScintilla.Shell.html#Shell.isHistoryEnabled" />
       <keyword name="Shell.keyPressEvent" id="Shell.keyPressEvent" ref="eric6.QScintilla.Shell.html#Shell.keyPressEvent" />
       <keyword name="Shell.loadHistory" id="Shell.loadHistory" ref="eric6.QScintilla.Shell.html#Shell.loadHistory" />
       <keyword name="Shell.mousePressEvent" id="Shell.mousePressEvent" ref="eric6.QScintilla.Shell.html#Shell.mousePressEvent" />
@@ -12597,6 +12607,7 @@
       <keyword name="ShellHistoryDialog.on_historyList_itemDoubleClicked" id="ShellHistoryDialog.on_historyList_itemDoubleClicked" ref="eric6.QScintilla.ShellHistoryDialog.html#ShellHistoryDialog.on_historyList_itemDoubleClicked" />
       <keyword name="ShellHistoryDialog.on_historyList_itemSelectionChanged" id="ShellHistoryDialog.on_historyList_itemSelectionChanged" ref="eric6.QScintilla.ShellHistoryDialog.html#ShellHistoryDialog.on_historyList_itemSelectionChanged" />
       <keyword name="ShellHistoryDialog.on_reloadButton_clicked" id="ShellHistoryDialog.on_reloadButton_clicked" ref="eric6.QScintilla.ShellHistoryDialog.html#ShellHistoryDialog.on_reloadButton_clicked" />
+      <keyword name="ShellHistoryStyle" id="ShellHistoryStyle" ref="eric6.QScintilla.Shell.html#ShellHistoryStyle" />
       <keyword name="ShellPage" id="ShellPage" ref="eric6.Preferences.ConfigurationPages.ShellPage.html#ShellPage" />
       <keyword name="ShellPage (Constructor)" id="ShellPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.ShellPage.html#ShellPage.__init__" />
       <keyword name="ShellPage (Module)" id="ShellPage (Module)" ref="eric6.Preferences.ConfigurationPages.ShellPage.html" />
@@ -12621,6 +12632,7 @@
       <keyword name="ShellWindow.__createViewActions" id="ShellWindow.__createViewActions" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__createViewActions" />
       <keyword name="ShellWindow.__doClearRestart" id="ShellWindow.__doClearRestart" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__doClearRestart" />
       <keyword name="ShellWindow.__doRestart" id="ShellWindow.__doRestart" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__doRestart" />
+      <keyword name="ShellWindow.__historyStyleChanged" id="ShellWindow.__historyStyleChanged" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__historyStyleChanged" />
       <keyword name="ShellWindow.__newWindow" id="ShellWindow.__newWindow" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__newWindow" />
       <keyword name="ShellWindow.__readSettings" id="ShellWindow.__readSettings" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__readSettings" />
       <keyword name="ShellWindow.__readShortcut" id="ShellWindow.__readShortcut" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__readShortcut" />
--- a/Documentation/Source/eric6.QScintilla.Shell.html	Mon Jul 10 18:24:35 2017 +0200
+++ b/Documentation/Source/eric6.QScintilla.Shell.html	Mon Jul 10 18:48:33 2017 +0200
@@ -35,6 +35,9 @@
 </tr><tr>
 <td><a href="#ShellAssembly">ShellAssembly</a></td>
 <td>Class implementing the containing widget for the shell.</td>
+</tr><tr>
+<td><a href="#ShellHistoryStyle">ShellHistoryStyle</a></td>
+<td>Class defining the shell history styles.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -51,10 +54,14 @@
     Python interpreter.
 </p><h3>Signals</h3>
 <dl>
-<dt>searchStringFound(found)</dt>
+<dt>historyStyleChanged(ShellHistoryStyle)</dt>
+<dd>
+emitted to indicate a
+        change of the history style
+</dd><dt>searchStringFound(bool)</dt>
 <dd>
 emitted to indicate the search
-        result (boolean)
+        result
 </dd>
 </dl>
 <h3>Derived from</h3>
@@ -76,6 +83,9 @@
 <td><a href="#Shell.__QScintillaAutoCompletionCommand">__QScintillaAutoCompletionCommand</a></td>
 <td>Private method to handle a command for autocompletion only.</td>
 </tr><tr>
+<td><a href="#Shell.__QScintillaCancel">__QScintillaCancel</a></td>
+<td>Private method to handle the ESC command.</td>
+</tr><tr>
 <td><a href="#Shell.__QScintillaCharLeft">__QScintillaCharLeft</a></td>
 <td>Private method to handle the Cursor Left command.</td>
 </tr><tr>
@@ -107,10 +117,10 @@
 <td>Private method to handle the Delete Word Right command.</td>
 </tr><tr>
 <td><a href="#Shell.__QScintillaHistoryDown">__QScintillaHistoryDown</a></td>
-<td>Private method to handle the Ctrl+Down key.</td>
+<td>Private method to handle the history down command.</td>
 </tr><tr>
 <td><a href="#Shell.__QScintillaHistoryUp">__QScintillaHistoryUp</a></td>
-<td>Private method to handle the Ctrl+Up key.</td>
+<td>Private method to handle the history up command.</td>
 </tr><tr>
 <td><a href="#Shell.__QScintillaLeftCommand">__QScintillaLeftCommand</a></td>
 <td>Private method to handle a QScintilla command working to the left.</td>
@@ -118,9 +128,15 @@
 <td><a href="#Shell.__QScintillaLeftDeleteCommand">__QScintillaLeftDeleteCommand</a></td>
 <td>Private method to handle a QScintilla delete command working to the left.</td>
 </tr><tr>
+<td><a href="#Shell.__QScintillaLineDown">__QScintillaLineDown</a></td>
+<td>Private method to handle the cursor down command.</td>
+</tr><tr>
 <td><a href="#Shell.__QScintillaLineEnd">__QScintillaLineEnd</a></td>
 <td>Private method to handle the End key.</td>
 </tr><tr>
+<td><a href="#Shell.__QScintillaLineUp">__QScintillaLineUp</a></td>
+<td>Private method to handle the cursor up command.</td>
+</tr><tr>
 <td><a href="#Shell.__QScintillaNewline">__QScintillaNewline</a></td>
 <td>Private method to handle the Return key.</td>
 </tr><tr>
@@ -205,6 +221,9 @@
 <td><a href="#Shell.__isCursorOnLastLine">__isCursorOnLastLine</a></td>
 <td>Private method to check, if the cursor is on the last line.</td>
 </tr><tr>
+<td><a href="#Shell.__isHistoryIndexValid">__isHistoryIndexValid</a></td>
+<td>Private method to test, if the history index is valid.</td>
+</tr><tr>
 <td><a href="#Shell.__middleMouseButton">__middleMouseButton</a></td>
 <td>Private method to handle the middle mouse button press.</td>
 </tr><tr>
@@ -217,6 +236,9 @@
 <td><a href="#Shell.__resetAndClear">__resetAndClear</a></td>
 <td>Private slot to handle the 'reset and clear' context menu entry.</td>
 </tr><tr>
+<td><a href="#Shell.__resetIncrementalHistorySearch">__resetIncrementalHistorySearch</a></td>
+<td>Private method to reset the incremental history search.</td>
+</tr><tr>
 <td><a href="#Shell.__resizeLinenoMargin">__resizeLinenoMargin</a></td>
 <td>Private slot to resize the line numbers margin.</td>
 </tr><tr>
@@ -238,6 +260,9 @@
 <td><a href="#Shell.__setCallTips">__setCallTips</a></td>
 <td>Private method to configure the calltips function.</td>
 </tr><tr>
+<td><a href="#Shell.__setHistoryIndex">__setHistoryIndex</a></td>
+<td>Private method to set the initial history index.</td>
+</tr><tr>
 <td><a href="#Shell.__setMargin0">__setMargin0</a></td>
 <td>Private method to configure margin 0.</td>
 </tr><tr>
@@ -247,6 +272,9 @@
 <td><a href="#Shell.__setTextDisplay">__setTextDisplay</a></td>
 <td>Private method to configure the text display.</td>
 </tr><tr>
+<td><a href="#Shell.__setupCursorKeys">__setupCursorKeys</a></td>
+<td>Private method to setup the cursor up and down mode.</td>
+</tr><tr>
 <td><a href="#Shell.__showCompletions">__showCompletions</a></td>
 <td>Private method to display the possible completions.</td>
 </tr><tr>
@@ -328,12 +356,21 @@
 <td><a href="#Shell.getHistory">getHistory</a></td>
 <td>Public method to get the history for the given client type.</td>
 </tr><tr>
+<td><a href="#Shell.getHistoryIndex">getHistoryIndex</a></td>
+<td>Public method to get the current value of the history index.</td>
+</tr><tr>
 <td><a href="#Shell.handlePreferencesChanged">handlePreferencesChanged</a></td>
 <td>Public slot to handle the preferencesChanged signal.</td>
 </tr><tr>
+<td><a href="#Shell.historyStyle">historyStyle</a></td>
+<td>Public method to get the shell history style.</td>
+</tr><tr>
 <td><a href="#Shell.insert">insert</a></td>
 <td>Public slot to insert text at the current cursor position.</td>
 </tr><tr>
+<td><a href="#Shell.isHistoryEnabled">isHistoryEnabled</a></td>
+<td>Public method to check, if the history is enabled.</td>
+</tr><tr>
 <td><a href="#Shell.keyPressEvent">keyPressEvent</a></td>
 <td>Protected method to handle the user input a key at a time.</td>
 </tr><tr>
@@ -405,7 +442,12 @@
 <dd>
 QScintilla command
 </dd>
-</dl><a NAME="Shell.__QScintillaCharLeft" ID="Shell.__QScintillaCharLeft"></a>
+</dl><a NAME="Shell.__QScintillaCancel" ID="Shell.__QScintillaCancel"></a>
+<h4>Shell.__QScintillaCancel</h4>
+<b>__QScintillaCancel</b>(<i></i>)
+<p>
+        Private method to handle the ESC command.
+</p><a NAME="Shell.__QScintillaCharLeft" ID="Shell.__QScintillaCharLeft"></a>
 <h4>Shell.__QScintillaCharLeft</h4>
 <b>__QScintillaCharLeft</b>(<i></i>)
 <p>
@@ -464,7 +506,7 @@
 <h4>Shell.__QScintillaHistoryDown</h4>
 <b>__QScintillaHistoryDown</b>(<i>cmd</i>)
 <p>
-        Private method to handle the Ctrl+Down key.
+        Private method to handle the history down command.
 </p><dl>
 <dt><i>cmd</i></dt>
 <dd>
@@ -474,7 +516,7 @@
 <h4>Shell.__QScintillaHistoryUp</h4>
 <b>__QScintillaHistoryUp</b>(<i>cmd</i>)
 <p>
-        Private method to handle the Ctrl+Up key.
+        Private method to handle the history up command.
 </p><dl>
 <dt><i>cmd</i></dt>
 <dd>
@@ -505,6 +547,16 @@
 <dd>
 shell method to execute
 </dd>
+</dl><a NAME="Shell.__QScintillaLineDown" ID="Shell.__QScintillaLineDown"></a>
+<h4>Shell.__QScintillaLineDown</h4>
+<b>__QScintillaLineDown</b>(<i>cmd</i>)
+<p>
+        Private method to handle the cursor down command.
+</p><dl>
+<dt><i>cmd</i></dt>
+<dd>
+QScintilla command
+</dd>
 </dl><a NAME="Shell.__QScintillaLineEnd" ID="Shell.__QScintillaLineEnd"></a>
 <h4>Shell.__QScintillaLineEnd</h4>
 <b>__QScintillaLineEnd</b>(<i>cmd</i>)
@@ -515,6 +567,16 @@
 <dd>
 QScintilla command
 </dd>
+</dl><a NAME="Shell.__QScintillaLineUp" ID="Shell.__QScintillaLineUp"></a>
+<h4>Shell.__QScintillaLineUp</h4>
+<b>__QScintillaLineUp</b>(<i>cmd</i>)
+<p>
+        Private method to handle the cursor up command.
+</p><dl>
+<dt><i>cmd</i></dt>
+<dd>
+QScintilla command
+</dd>
 </dl><a NAME="Shell.__QScintillaNewline" ID="Shell.__QScintillaNewline"></a>
 <h4>Shell.__QScintillaNewline</h4>
 <b>__QScintillaNewline</b>(<i>cmd</i>)
@@ -697,13 +759,16 @@
         Private method to open the configuration dialog.
 </p><a NAME="Shell.__executeCommand" ID="Shell.__executeCommand"></a>
 <h4>Shell.__executeCommand</h4>
-<b>__executeCommand</b>(<i>cmd</i>)
+<b>__executeCommand</b>(<i>cmd, historyIndex=None</i>)
 <p>
         Private slot to execute a command.
 </p><dl>
-<dt><i>cmd</i></dt>
+<dt><i>cmd</i> (str)</dt>
 <dd>
-command to be executed by debug client (string)
+command to be executed by debug client
+</dd><dt><i>historyIndex</i> (int)</dt>
+<dd>
+history index to be set
 </dd>
 </dl><a NAME="Shell.__find" ID="Shell.__find"></a>
 <h4>Shell.__find</h4>
@@ -784,6 +849,21 @@
 <dd>
 flag indicating that the cursor is on the last line (boolean)
 </dd>
+</dl><a NAME="Shell.__isHistoryIndexValid" ID="Shell.__isHistoryIndexValid"></a>
+<h4>Shell.__isHistoryIndexValid</h4>
+<b>__isHistoryIndexValid</b>(<i></i>)
+<p>
+        Private method to test, if the history index is valid.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating validity
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="Shell.__middleMouseButton" ID="Shell.__middleMouseButton"></a>
 <h4>Shell.__middleMouseButton</h4>
 <b>__middleMouseButton</b>(<i></i>)
@@ -812,6 +892,11 @@
 <b>__resetAndClear</b>(<i></i>)
 <p>
         Private slot to handle the 'reset and clear' context menu entry.
+</p><a NAME="Shell.__resetIncrementalHistorySearch" ID="Shell.__resetIncrementalHistorySearch"></a>
+<h4>Shell.__resetIncrementalHistorySearch</h4>
+<b>__resetIncrementalHistorySearch</b>(<i></i>)
+<p>
+        Private method to reset the incremental history search.
 </p><a NAME="Shell.__resizeLinenoMargin" ID="Shell.__resizeLinenoMargin"></a>
 <h4>Shell.__resizeLinenoMargin</h4>
 <b>__resizeLinenoMargin</b>(<i></i>)
@@ -823,17 +908,23 @@
 <p>
         Private method used to reverse search the history.
 </p><dl>
-<dt><i>txt</i></dt>
+<dt><i>txt</i> (str)</dt>
 <dd>
-text to match at the beginning (string)
-</dd><dt><i>startIdx</i></dt>
+text to match at the beginning
+</dd><dt><i>startIdx</i> (int)</dt>
 <dd>
-index to start search from (integer)
+index to start search from
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-index of found entry (integer)
+tuple containing the index of found entry and a flag indicating
+            that something was found
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (int, bool)
 </dd>
 </dl><a NAME="Shell.__searchHistory" ID="Shell.__searchHistory"></a>
 <h4>Shell.__searchHistory</h4>
@@ -841,17 +932,23 @@
 <p>
         Private method used to search the history.
 </p><dl>
-<dt><i>txt</i></dt>
+<dt><i>txt</i> (str)</dt>
 <dd>
-text to match at the beginning (string)
-</dd><dt><i>startIdx</i></dt>
+text to match at the beginning
+</dd><dt><i>startIdx</i> (int)</dt>
 <dd>
-index to start search from (integer)
+index to start search from
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-index of found entry (integer)
+tuple containing the index of found entry and a flag indicating
+            that something was found
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (int, bool)
 </dd>
 </dl><a NAME="Shell.__searchNext" ID="Shell.__searchNext"></a>
 <h4>Shell.__searchNext</h4>
@@ -883,6 +980,16 @@
 <dd>
 of the calltips set to set (string)
 </dd>
+</dl><a NAME="Shell.__setHistoryIndex" ID="Shell.__setHistoryIndex"></a>
+<h4>Shell.__setHistoryIndex</h4>
+<b>__setHistoryIndex</b>(<i>index=None</i>)
+<p>
+        Private method to set the initial history index.
+</p><dl>
+<dt><i>index</i> (int or None)</dt>
+<dd>
+index value to be set
+</dd>
 </dl><a NAME="Shell.__setMargin0" ID="Shell.__setMargin0"></a>
 <h4>Shell.__setMargin0</h4>
 <b>__setMargin0</b>(<i></i>)
@@ -903,6 +1010,11 @@
 <b>__setTextDisplay</b>(<i></i>)
 <p>
         Private method to configure the text display.
+</p><a NAME="Shell.__setupCursorKeys" ID="Shell.__setupCursorKeys"></a>
+<h4>Shell.__setupCursorKeys</h4>
+<b>__setupCursorKeys</b>(<i></i>)
+<p>
+        Private method to setup the cursor up and down mode.
 </p><a NAME="Shell.__showCompletions" ID="Shell.__showCompletions"></a>
 <h4>Shell.__showCompletions</h4>
 <b>__showCompletions</b>(<i>completions, text</i>)
@@ -1085,14 +1197,17 @@
 </dd>
 </dl><a NAME="Shell.executeLines" ID="Shell.executeLines"></a>
 <h4>Shell.executeLines</h4>
-<b>executeLines</b>(<i>lines</i>)
+<b>executeLines</b>(<i>lines, historyIndex=None</i>)
 <p>
         Public method to execute a set of lines as multiple commands.
 </p><dl>
-<dt><i>lines</i></dt>
+<dt><i>lines</i> (str)</dt>
 <dd>
-multiple lines of text to be executed as single
-            commands (string)
+multiple lines of text to be executed as
+            single commands
+</dd><dt><i>historyIndex</i> (int)</dt>
+<dd>
+history index to be set
 </dd>
 </dl><a NAME="Shell.focusInEvent" ID="Shell.focusInEvent"></a>
 <h4>Shell.focusInEvent</h4>
@@ -1168,12 +1283,42 @@
 <dd>
 reference to the history list (list of strings)
 </dd>
+</dl><a NAME="Shell.getHistoryIndex" ID="Shell.getHistoryIndex"></a>
+<h4>Shell.getHistoryIndex</h4>
+<b>getHistoryIndex</b>(<i></i>)
+<p>
+        Public method to get the current value of the history index.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+history index
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+int
+</dd>
 </dl><a NAME="Shell.handlePreferencesChanged" ID="Shell.handlePreferencesChanged"></a>
 <h4>Shell.handlePreferencesChanged</h4>
 <b>handlePreferencesChanged</b>(<i></i>)
 <p>
         Public slot to handle the preferencesChanged signal.
-</p><a NAME="Shell.insert" ID="Shell.insert"></a>
+</p><a NAME="Shell.historyStyle" ID="Shell.historyStyle"></a>
+<h4>Shell.historyStyle</h4>
+<b>historyStyle</b>(<i></i>)
+<p>
+        Public method to get the shell history style.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+shell history style
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+ShellHistoryStyle
+</dd>
+</dl><a NAME="Shell.insert" ID="Shell.insert"></a>
 <h4>Shell.insert</h4>
 <b>insert</b>(<i>txt</i>)
 <p>
@@ -1185,6 +1330,21 @@
 <dd>
 text to be inserted (string)
 </dd>
+</dl><a NAME="Shell.isHistoryEnabled" ID="Shell.isHistoryEnabled"></a>
+<h4>Shell.isHistoryEnabled</h4>
+<b>isHistoryEnabled</b>(<i></i>)
+<p>
+        Public method to check, if the history is enabled.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating if history is enabled
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="Shell.keyPressEvent" ID="Shell.keyPressEvent"></a>
 <h4>Shell.keyPressEvent</h4>
 <b>keyPressEvent</b>(<i>ev</i>)
@@ -1378,5 +1538,31 @@
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="ShellHistoryStyle" ID="ShellHistoryStyle"></a>
+<h2>ShellHistoryStyle</h2>
+<p>
+    Class defining the shell history styles.
+</p>
+<h3>Derived from</h3>
+Enum
+<h3>Class Attributes</h3>
+<table>
+<tr><td>Disabled</td></tr><tr><td>LinuxStyle</td></tr><tr><td>WindowsStyle</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.QScintilla.ShellHistoryDialog.html	Mon Jul 10 18:24:35 2017 +0200
+++ b/Documentation/Source/eric6.QScintilla.ShellHistoryDialog.html	Mon Jul 10 18:48:33 2017 +0200
@@ -92,13 +92,13 @@
 <p>
         Constructor
 </p><dl>
-<dt><i>history</i></dt>
+<dt><i>history</i> (list of str)</dt>
 <dd>
-reference to the current shell history (list of strings)
-</dd><dt><i>vm</i></dt>
+reference to the current shell history
+</dd><dt><i>vm</i> (ViewManager)</dt>
 <dd>
 reference to the viewmanager object
-</dd><dt><i>shell</i></dt>
+</dd><dt><i>shell</i> (Shell)</dt>
 <dd>
 reference to the shell object
 </dd>
@@ -110,7 +110,13 @@
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-list of history entries (list of strings)
+tuple containing the list of history entries and the
+            current row
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (list of str, int)
 </dd>
 </dl><a NAME="ShellHistoryDialog.on_copyButton_clicked" ID="ShellHistoryDialog.on_copyButton_clicked"></a>
 <h4>ShellHistoryDialog.on_copyButton_clicked</h4>
--- a/Documentation/Source/eric6.QScintilla.ShellWindow.html	Mon Jul 10 18:24:35 2017 +0200
+++ b/Documentation/Source/eric6.QScintilla.ShellWindow.html	Mon Jul 10 18:48:33 2017 +0200
@@ -102,6 +102,9 @@
 <td><a href="#ShellWindow.__doRestart">__doRestart</a></td>
 <td>Private slot to handle the 'restart' menu entry.</td>
 </tr><tr>
+<td><a href="#ShellWindow.__historyStyleChanged">__historyStyleChanged</a></td>
+<td>Private slot to handle a change of the shell history style.</td>
+</tr><tr>
 <td><a href="#ShellWindow.__newWindow">__newWindow</a></td>
 <td>Private slot to start a new instance of eric6.</td>
 </tr><tr>
@@ -249,7 +252,17 @@
 <b>__doRestart</b>(<i></i>)
 <p>
         Private slot to handle the 'restart' menu entry.
-</p><a NAME="ShellWindow.__newWindow" ID="ShellWindow.__newWindow"></a>
+</p><a NAME="ShellWindow.__historyStyleChanged" ID="ShellWindow.__historyStyleChanged"></a>
+<h4>ShellWindow.__historyStyleChanged</h4>
+<b>__historyStyleChanged</b>(<i>historyStyle</i>)
+<p>
+        Private slot to handle a change of the shell history style.
+</p><dl>
+<dt><i>historyStyle</i> (ShellHistoryStyle)</dt>
+<dd>
+style to be used for the history
+</dd>
+</dl><a NAME="ShellWindow.__newWindow" ID="ShellWindow.__newWindow"></a>
 <h4>ShellWindow.__newWindow</h4>
 <b>__newWindow</b>(<i></i>)
 <p>
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserView.html	Mon Jul 10 18:24:35 2017 +0200
+++ b/Documentation/Source/eric6.WebBrowser.WebBrowserView.html	Mon Jul 10 18:48:33 2017 +0200
@@ -259,7 +259,7 @@
 <td>Protected method to handle wheel events.</td>
 </tr><tr>
 <td><a href="#WebBrowserView.activateSession">activateSession</a></td>
-<td>Private slot to activate a restored session.</td>
+<td>Public slot to activate a restored session.</td>
 </tr><tr>
 <td><a href="#WebBrowserView.addBookmark">addBookmark</a></td>
 <td>Public slot to bookmark the current page.</td>
@@ -936,7 +936,7 @@
 <h4>WebBrowserView.activateSession</h4>
 <b>activateSession</b>(<i></i>)
 <p>
-        Private slot to activate a restored session.
+        Public slot to activate a restored session.
 </p><a NAME="WebBrowserView.addBookmark" ID="WebBrowserView.addBookmark"></a>
 <h4>WebBrowserView.addBookmark</h4>
 <b>addBookmark</b>(<i></i>)
--- a/QScintilla/Shell.py	Mon Jul 10 18:24:35 2017 +0200
+++ b/QScintilla/Shell.py	Mon Jul 10 18:48:33 2017 +0200
@@ -145,7 +145,9 @@
                 """<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. Pressing these keys after some text has been"""
+                """ 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. 'reset' kills the"""
                 """ shell and starts a new one. 'clear' clears the display"""
@@ -170,7 +172,9 @@
                 """<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. Pressing these keys after some text has been"""
+                """ 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. 'reset' kills the"""
                 """ shell and starts a new one. 'clear' clears the display"""
--- a/changelog	Mon Jul 10 18:24:35 2017 +0200
+++ b/changelog	Mon Jul 10 18:48:33 2017 +0200
@@ -2,6 +2,10 @@
 ----------
 Version 17.08:
 - bug fixes
+- Shell
+  -- added support for dfferent history navigation styles (disabled, Linux,
+     Windows)
+  -- improved shell history dialog
 - Templates
   - added some new predefined template variables (time, path_name_rel,
     dir_name_rel)
--- a/i18n/eric6_cs.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_cs.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -41021,27 +41021,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51336,57 +51336,57 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation>Shell - pasivní</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
+        <location filename="../QScintilla/Shell.py" line="250"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Pasivní &gt;&gt;&gt; </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
+        <location filename="../QScintilla/Shell.py" line="266"/>
         <source>Start</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation>Vyčistit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation>Reset a vyčistit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation>Č.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
@@ -51396,84 +51396,84 @@
         <translation type="obsolete">&lt;b&gt;Okno Shellu&lt;/b&gt;&lt;p&gt;Toto je jednoduchý interpretr běžící v okně. Interpretr běží nezávisle na programu, který je debugován. To znamená, že můžete spustit jakýkoliv příkaz i během debugování.&lt;/p&gt;&lt;p&gt;Během vkládání příkazu můžete použít kurzorové klávesy. Je zde také historie příkazů, která se aktivuje klávesami up a down. Stisknutím up nebo down klávesy po textu, který byl zadán se spustí inkrementální vyhledávání.&lt;/p&gt;&lt;p&gt;Shell má několik speciálních příkazů. &apos;reset&apos; zabije shell a spustí nový. &apos;clear&apos; vyčistí obsah shell okna.&apos;start&apos; se používá pro přepnutí shell jazyka a musí za ním následovat jméno podporovaného jazyka. Podporované jazyky jsou zobrazeny v seznamu, který vrací příkaz &apos;languages&apos;. Tyto příkazy (kromě &apos;languages&apos;) jsou také dostupné přes kontextové menu.&lt;/p&gt;&lt;p&gt;Stisknutím tab klávesy po nějakém vloženém textu se zobrazí seznam s nabídkou možných zakončení výrazu. Odpovídající zadání pak může být vybráno z tohoto listu. Pokud je existuje jen jedna možnost, je vložena automaticky.&lt;/p&gt;&lt;p&gt;Dokud se program neukončí, je shell v pasivním módu dostupný jen pokud se debugovaný program připojil k IDE. To je oznámeno odlišným promptem a dále v názvu titulku okna.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation>Pasivní debug mód</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
+        <location filename="../QScintilla/Shell.py" line="271"/>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
+        <location filename="../QScintilla/Shell.py" line="272"/>
         <source>Select entry</source>
         <translation>Vybrat vstupy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="250"/>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation>Vybrat historii</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Vybrat vstup historie pro vykonání (nejaktuálnější zobrazen poslední).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation>Nepřipojen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation>Konfigurovat...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} na {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Shell jazyk &quot;{0}&quot; není podporován.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -51481,38 +51481,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="126"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51622,348 +51622,404 @@
         <translation>Zvýrazňování syntaxe zapnuto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation>Max. položek v historii:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation>Zadejte maximální počet položek v historii</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation>Vybrat pro zobrazení debugování na stdout a stderr</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation>Zobrazit debugování na stdout a stderr</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation>Stisknout pro výběr fontu, který bude použit pro neproporcionální písmo</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
+        <source>Monospaced Font</source>
+        <translation>Neproporcionální font</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation>Neproporcionální text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation>Vybrat, má-li být jako default použit neproporcioální font</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation>Neproporcionální font jako default</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation>Font čísel řádek</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation>Stisknout pro výběr fontu pro čísla řádků v editoru</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation type="unfinished">Historie</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
-        <source>Monospaced Font</source>
-        <translation>Neproporcionální font</translation>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation>Neproporcionální text</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation>Vybrat, má-li být jako default použit neproporcioální font</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation>Neproporcionální font jako default</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation>Font čísel řádek</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
-        <translation>Stisknout pro výběr fontu pro čísla řádků v editoru</translation>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation type="unfinished">Vypnuto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation type="unfinished">Konec</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Konec</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation type="unfinished">Ukončit IDE</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation type="unfinished">Nové okno</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation type="unfinished">&amp;Nové okno</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
-        <source>Open a new Shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <source>Open a new Shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation type="unfinished">Vyčistit historii</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation type="unfinished">O aplikaci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation type="unfinished">O &amp;aplikaci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation type="unfinished">Zobrazit informace a tomto software</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation type="unfinished">Zobrazit informace a tomto software</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;O aplikaci&lt;/b&gt;&lt;p&gt;Zobrazí se informace o tomto software.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation type="unfinished">O Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation type="unfinished">O &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation type="unfinished">Zobrazit informace o Qt toolkitu</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation type="unfinished">Zobrazit informace o Qt toolkitu</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation type="unfinished">Co je to?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation type="unfinished">&amp;Co je to?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation type="unfinished">Kontextově senzitivní nápověda</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Zobrazit kontextově senzitivní nápovědu&lt;/b&gt;&lt;p&gt;V režimu &quot;Co je to?&quot; se nad různými prvky aplikace u kurzoru zobrazí otazník. Když pak kliknete na tyto prvky, zobrazí se krátký popis co daný prvek znamená a jak jej použít. V dialogových oknech se tato funkce spustí tlačítkem kontextové nápovědy na horní liště.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation type="unfinished">S&amp;oubor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation type="unfinished">Poh&amp;led</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation type="unfinished">&amp;Start</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation type="unfinished">Soubor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation type="unfinished">Pohled</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation type="unfinished">Historie</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_de.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -40110,27 +40110,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
@@ -50416,141 +50416,141 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation>Shell – Passiv</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
+        <location filename="../QScintilla/Shell.py" line="250"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Passiv &gt;&gt;&gt; </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation>Zurücksetzen und Löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation>Drop Fehler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
+        <location filename="../QScintilla/Shell.py" line="266"/>
         <source>Start</source>
         <translation>Starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} auf {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Die Shell-Sprache „{0}“ wird nicht unterstützt.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation>Passiver Debugmodus</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
+        <location filename="../QScintilla/Shell.py" line="271"/>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
+        <location filename="../QScintilla/Shell.py" line="272"/>
         <source>Select entry</source>
         <translation>Eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="250"/>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation>Eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Wähle den auszuführenden Eintrag aus (aktuellster ist zuletzt dargestellt).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation>
 nicht verbunden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -50561,14 +50561,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Unspezifischer Syntaxfehler.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -50577,28 +50577,28 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Syntaxfehler &quot;{1}&quot; in Datei {0}, Zeile {2}, Zeichen {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Signal &quot;{0}&quot; in der Datei {1} in Zeile {2} erzeugt.
 Funktion: {3}({4})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="126"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter bedient wird. Eine inkrementelle Suche wird gestartet, indem die Cursortasten Hoch und Runter nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. &quot;quit&quot; beendet die Anwendung. Diese Befehle (Ausnahme „languages“) sind auch über die Anwendungsmenüs verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Dies ist ein Interpreter Ihres Systems. Es ist derjenige, der benutzt wird, um das zu untersuchende Programm auszuführen. Dies bedeutet, dass Sie jedes Pythonkommando ausführen können, auch während Ihr Programm läuft.&lt;/p&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter bedient wird. Eine inkrementelle Suche wird gestartet, indem die Cursortasten Hoch und Runter nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. Diese Befehle (Ausnahme „languages“) sind auch über das Kontextmenu verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;&lt;p&gt;Im passiven Debugmodus ist die Shell nur dann verfügbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.&lt;/p&gt;</translation>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter unter Halten der Strg-Taste bedient wird. Dies kann über die Shell Seite des Konfigurationsdialoges auf Cursortasten Hoch und Runter alleine umgeschaltet werden. Eine inkrementelle Suche wird gestartet, indem diese Tasten nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. &quot;quit&quot; beendet die Anwendung. Diese Befehle (Ausnahme „languages“) sind auch über die Anwendungsmenüs verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Dies ist ein Interpreter Ihres Systems. Es ist derjenige, der benutzt wird, um das zu untersuchende Programm auszuführen. Dies bedeutet, dass Sie jedes Pythonkommando ausführen können, auch während Ihr Programm läuft.&lt;/p&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter unter Halten der Strg-Taste bedient wird. Dies kann über die Shell Seite des Konfigurationsdialoges auf Cursortasten Hoch und Runter alleine umgeschaltet werden. Eine inkrementelle Suche wird gestartet, indem diese Tasten nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. Diese Befehle (Ausnahme „languages“) sind auch über das Kontextmenu verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;&lt;p&gt;Im passiven Debugmodus ist die Shell nur dann verfügbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -50692,12 +50692,12 @@
         <translation>Zeilenumbruch aktivieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation>maximale Anzahl der Chronik-Einträge:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation>Gib die maximale Zahl an Chronik-Einträgen an</translation>
     </message>
@@ -50717,338 +50717,395 @@
         <translation>Syntaxhervorhebung aktivieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation>Auswählen, um StdOut und StdErr des Debuggers anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation>Debugger StdOut und StdErr anzeigen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation>Drücken, um den Font  auszuwählen, der als Monospace-Font verwendet wird</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
+        <source>Monospaced Font</source>
+        <translation>Monospace-Font</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation>Monospace-Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation>Wähle, ob der Monospace-Font als Standard benutzt werden soll</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation>Benutze Monospace-Font als Standard</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation>Zeilennummernfont</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation>2345</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation>Drücken, um den Font für die Zeilennummern zu wählen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation>Chronik</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation>Navigationsstil:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation>Wähle den Navigationsstil aus</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
-        <source>Monospaced Font</source>
-        <translation>Monospace-Font</translation>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation>Auswählen, um bei der Navigation in der Chronik am Anfang oder Ende fortzufahren</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
+        <translation>Bei Navigation am Anfang oder Ende fortfahren</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation>Monospace-Text</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation>Wähle, ob der Monospace-Font als Standard benutzt werden soll</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation>Benutze Monospace-Font als Standard</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation>Zeilennummernfont</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
-        <translation>2345</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
-        <translation>Drücken, um den Font für die Zeilennummern zu wählen</translation>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation>Auswählen, um die Auf und Ab Tasten zum Navigieren in der Chronik zu verwenden</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Auf/Ab navigieren in der Chronik&lt;/b&gt;
+&lt;p&gt;Wählen sie diesen Eintrag aus, um mit den Auf und Ab Tasten in der Chronik zu Navigieren. Ist er abgewählt, so erfolgt die Navigation mit Strg-Auf bzw. Strg-Ab.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation>Auf/Ab navigieren in der Chronik</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation>Ausgeschaltet</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation>Linux Stil</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
+        <translation>Windows Stil</translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation>B&amp;eenden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation>Beenden der Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Beenden der Shell&lt;/b&gt;&lt;p&gt;Dies schließt das Shell Fenster.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation>Neues Fenster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation>Neues &amp;Fenster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
+        <location filename="../QScintilla/ShellWindow.py" line="211"/>
         <source>Open a new Shell window</source>
         <translation>Öffne ein neues Shell Fenster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Neues Fenster&lt;/b&gt;&lt;p&gt;Dies öffnet eine neue Instanz des Shell Fensters.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation>Neu starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation>Shell neu starten</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation>Shell neu starten</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Neu starten&lt;/b&gt;&lt;p&gt;Dies startet die Shell für die aktuell ausgewählte Sprache neu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation>Neu starten und löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation>Löscht das Fenster und startet die Shell neu</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation>Löscht das Fenster und startet die Shell neu</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Neu starten und löschen&lt;/b&gt;&lt;p&gt;Löscht das Shell Fenster und startet die Shell für die aktuell ausgewählte Sprache neu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation>Chronik anzeigen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation>Chronik &amp;anzeigen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation>Zeigt die Shell Chronik in einem Dialog an</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation>Chronik löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation>Chronik &amp;löschen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation>Löscht die Shell Chronik</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation>Chronikeintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation>Chronik&amp;eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation>Wählt einen Eintrag in der Shell Chronik aus</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation>Ü&amp;ber</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation>Zeigt Informationen zu diesem Programm an</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation>Zeigt Informationen zu diesem Programm an</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Über&lt;/b&gt;&lt;p&gt;Zeigt einige Informationen über dieses Programm an.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation>Über Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation>Über &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation>Zeige Informationen über das Qt-Toolkit an</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation>Zeige Informationen über das Qt-Toolkit an</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Über Qt&lt;/b&gt;&lt;p&gt;Zeige Informationen über das Qt-Toolkit an.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation>Was ist das?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation>&amp;Was ist das?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation>Shift+F1</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation>Kontextsensitive Hilfe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Zeige kontextsensitive Hilfe an&lt;b&gt;&lt;/p&gt;Im „Was ist das?“-Modus (der Mauszeiger stellt einen Pfeil mit Fragezeichen dar) wird auf einen Mausklick eine kurze Hilfebeschreibung zu dem ausgewählten HMI-Element angezeigt. In Dialogen kann diese Funktionalität durch den entsprechenden Knopf im Fensterkopf erreicht werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation>Über das eric6 Shell Fenster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation>Die eric6 Shell ist ein unabhängiges Shell Fenster. Es verwendet das gleiche Debugger Backend wie die vollständige IDE, wird aber unabhängig ausgeführt.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation>&amp;Chronik</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation>&amp;Starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation>Chronik</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Dieser Teil der Statusleiste ermöglicht das Zoomen der Shell.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation>Einen Chronikeintrag vorwärts</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation>Einen Chronikeintrag zurück</translation>
     </message>
--- a/i18n/eric6_empty.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_empty.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -39904,27 +39904,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49974,113 +49974,113 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
-        <source>Passive &gt;&gt;&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
-        <source>Select entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="250"/>
+        <source>Passive &gt;&gt;&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="266"/>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="271"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="272"/>
+        <source>Select entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -50088,64 +50088,64 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="126"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -50255,348 +50255,404 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
+        <source>Monospaced Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
-        <source>Monospaced Font</source>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
-        <source>Open a new Shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <source>Open a new Shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_en.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -39943,27 +39943,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50015,139 +50015,139 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
-        <source>Passive &gt;&gt;&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
-        <source>Select entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="250"/>
+        <source>Passive &gt;&gt;&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="266"/>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="271"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="272"/>
+        <source>Select entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -50155,38 +50155,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="126"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -50296,348 +50296,404 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
+        <source>Monospaced Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
-        <source>Monospaced Font</source>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
-        <source>Open a new Shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <source>Open a new Shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_es.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -40102,27 +40102,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
@@ -50374,140 +50374,140 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation>Shell - Pasivo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
-        <source>Passive &gt;&gt;&gt; </source>
-        <translation>Pasivo &gt;&gt;&gt; </translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
-        <source>Start</source>
-        <translation>Comienzo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
-        <source>Paste</source>
-        <translation>Pegar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
-        <source>Clear</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
-        <source>Reset</source>
-        <translation>Restaurar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
-        <source>Reset and Clear</source>
-        <translation>Restaurar y borrar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
-        <source>Passive Debug Mode</source>
-        <translation>Modo de depuración pasiva</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
-        <source>No.</source>
-        <translation>No.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
-        <source>Drop Error</source>
-        <translation>Error al soltar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
-        <source>History</source>
-        <translation>Historial</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
-        <source>Select entry</source>
-        <translation>Seleccionar entrada</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="250"/>
+        <source>Passive &gt;&gt;&gt; </source>
+        <translation>Pasivo &gt;&gt;&gt; </translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="266"/>
+        <source>Start</source>
+        <translation>Comienzo</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="279"/>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="280"/>
+        <source>Paste</source>
+        <translation>Pegar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="286"/>
+        <source>Clear</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="287"/>
+        <source>Reset</source>
+        <translation>Restaurar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="288"/>
+        <source>Reset and Clear</source>
+        <translation>Restaurar y borrar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="786"/>
+        <source>Passive Debug Mode</source>
+        <translation>Modo de depuración pasiva</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="789"/>
+        <source>No.</source>
+        <translation>No.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
+        <source>Drop Error</source>
+        <translation>Error al soltar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="271"/>
+        <source>History</source>
+        <translation>Historial</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="272"/>
+        <source>Select entry</source>
+        <translation>Seleccionar entrada</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation>Seleccionar historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Seleccionar la entrada del historial a ejecutar (las más recientes mostradas en último lugar).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation>No conectado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} en {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Lenguaje de Shell  &quot;{0}&quot; no soportado.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; no es un archivo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -50518,13 +50518,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Error de sintaxis sin especificar.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -50533,14 +50533,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Error de sintaxis &quot;{1}&quot; en archivo {0} en la línea {2}, carácter {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Señal &quot;{0}&quot; generada en el archivo {1} y línea {2}.
@@ -50549,12 +50549,22 @@
     <message>
         <location filename="../QScintilla/Shell.py" line="126"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;La Ventana de Shell&lt;/b&gt;&lt;p&gt;Puede utilizar las teclas de cursor al introducir comandos. Yambién hay un historial de comandos que pueden ser reinvocados usando las teclas de cursor arriba y abajo. Pulsando la tecla de arriba o abajo tras haber introducido algún texto comenzará una búsqueda incremental.&lt;/p&gt;&lt;p&gt;La shell tiene algunos comandos especiales. &apos;reset&apos; elimina la shell y comienza una nueva. &apos;clear&apos; limpia la ventana de shell. &apos;start&apos; se usa para cambiar el lenguaje de shell y debe ser continuada de un lenguaje soportado. Los lenguajes soportados se listan con el comando &apos;languages&apos;. &apos;quit&apos; se usa para salir de la aplicación.Estos comandos (excepto &apos;languages&apos;) están disponibles también a través del menú de la ventana.&lt;/p&gt;&lt;p&gt;Pulsando la tecla Tab después de introducir algún texto mostrará una lista de posibles completados. La entrada relevante se puede seleccionar de esta lista. Si solamente hay disponible una entrada, ésta se insertará automáticamente.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;La Ventana de Shell&lt;/b&gt;&lt;p&gt;Puede utilizar las teclas de cursor al introducir comandos. Yambién hay un historial de comandos que pueden ser reinvocados usando las teclas de cursor arriba y abajo. Pulsando la tecla de arriba o abajo tras haber introducido algún texto comenzará una búsqueda incremental.&lt;/p&gt;&lt;p&gt;La shell tiene algunos comandos especiales. &apos;reset&apos; elimina la shell y comienza una nueva. &apos;clear&apos; limpia la ventana de shell. &apos;start&apos; se usa para cambiar el lenguaje de shell y debe ser continuada de un lenguaje soportado. Los lenguajes soportados se listan con el comando &apos;languages&apos;. &apos;quit&apos; se usa para salir de la aplicación.Estos comandos (excepto &apos;languages&apos;) están disponibles también a través del menú de la ventana.&lt;/p&gt;&lt;p&gt;Pulsando la tecla Tab después de introducir algún texto mostrará una lista de posibles completados. La entrada relevante se puede seleccionar de esta lista. Si solamente hay disponible una entrada, ésta se insertará automáticamente.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../QScintilla/Shell.py" line="147"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;La Ventana de Shell&lt;/b&gt;&lt;p&gt;Es solamente un intérprete corriendo en una ventana. El intérprete es el que se ha usado para correr el programa en depuración. Esto significa que se puede ejecutar cualquier comando mientras el programa en depuración está corriendo.&lt;/p&gt;&lt;p&gt;Se pueden utilizar las teclas de cursor mientras se introducen comandos. Hay también un historial de comandos que se pueden rellamar utilizando las teclas de cursor arriba y abajo. Pulsando la tecla de arriba o abajo despues de haber introducido algún texto comenzará una búsqueda incremental.&lt;/p&gt;&lt;p&gt;La shell tiene algunos comandos especiales. &apos;reset&apos; elimina la shell y comienza una nueva. &apos;clear&apos; limpia la ventana de shell. &apos;start&apos; se usa para cambiar el lenguaje de shell y debe ser continuada de un lenguaje soportado. Los lenguajes soportados se listan con el comando &apos;languages&apos;. &apos;quit&apos; se usa para salir de la aplicación.Estos comandos (excepto &apos;languages&apos;) están disponibles también a través del menú de la ventana.&lt;/p&gt;&lt;p&gt;Pulsando la tecla Tab después de introducir algún texto mostrará una lista de posibles completados. La entrada relevante se puede seleccionar de esta lista. Si solamente hay disponible una entrada, ésta se insertará automáticamente.&lt;/p&gt;&lt;p&gt;En modo de depuración pasiva la shell está disponible únicamente a partir de que el programa a depurar ha conectado con la IDE y hasta que ha terminado. Esto se indica con un prompt distinto y con un indicador en el título de la ventana.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;La Ventana de Shell&lt;/b&gt;&lt;p&gt;Es solamente un intérprete corriendo en una ventana. El intérprete es el que se ha usado para correr el programa en depuración. Esto significa que se puede ejecutar cualquier comando mientras el programa en depuración está corriendo.&lt;/p&gt;&lt;p&gt;Se pueden utilizar las teclas de cursor mientras se introducen comandos. Hay también un historial de comandos que se pueden rellamar utilizando las teclas de cursor arriba y abajo. Pulsando la tecla de arriba o abajo despues de haber introducido algún texto comenzará una búsqueda incremental.&lt;/p&gt;&lt;p&gt;La shell tiene algunos comandos especiales. &apos;reset&apos; elimina la shell y comienza una nueva. &apos;clear&apos; limpia la ventana de shell. &apos;start&apos; se usa para cambiar el lenguaje de shell y debe ser continuada de un lenguaje soportado. Los lenguajes soportados se listan con el comando &apos;languages&apos;. &apos;quit&apos; se usa para salir de la aplicación.Estos comandos (excepto &apos;languages&apos;) están disponibles también a través del menú de la ventana.&lt;/p&gt;&lt;p&gt;Pulsando la tecla Tab después de introducir algún texto mostrará una lista de posibles completados. La entrada relevante se puede seleccionar de esta lista. Si solamente hay disponible una entrada, ésta se insertará automáticamente.&lt;/p&gt;&lt;p&gt;En modo de depuración pasiva la shell está disponible únicamente a partir de que el programa a depurar ha conectado con la IDE y hasta que ha terminado. Esto se indica con un prompt distinto y con un indicador en el título de la ventana.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -50663,348 +50673,404 @@
         <translation>Resaltado de sintaxis habilitado</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation>máx. número de Entradas de Historial:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation>Introducir el número de entradas de historial permitidas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation>Seleccionar para mostrar el stdout y stderr del programa en depuración</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation>Mostrar stdout y stderr del programa en depuracion</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation>Fuente</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation>Pulse para seleccionar la fuente para utilizar como fuente monoespacio</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
+        <source>Monospaced Font</source>
+        <translation>Fuente Monoespacio</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation>Texto Monoespaciado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation>Seleccionar si la fuente monoespacio se debe usar por defecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation>Usar monoespacio por defecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation>Fuente para números de Línea</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation>2345</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation>Pulse para seleccionar la fuente para los números de línea</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation type="unfinished">Historial</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
-        <source>Monospaced Font</source>
-        <translation>Fuente Monoespacio</translation>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation>Texto Monoespaciado</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation>Seleccionar si la fuente monoespacio se debe usar por defecto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation>Usar monoespacio por defecto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation>Fuente para números de Línea</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
-        <translation>2345</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
-        <translation>Pulse para seleccionar la fuente para los números de línea</translation>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation type="unfinished">Deshabilitado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation>Salir de la Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Salir de la Shell&lt;/b&gt;&lt;p&gt;Sale de la ventana de Shell.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation>Nueva Ventana</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation>Nueva &amp;Ventana</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
+        <location filename="../QScintilla/ShellWindow.py" line="211"/>
         <source>Open a new Shell window</source>
         <translation>Abrir una nueva ventana de Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nueva Ventana&lt;/b&gt;&lt;p&gt;Abre una nueva instancia de la ventana de Shell.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation>Reiniciar la Shell</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation>Reiniciar la Shell</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Reiniciar&lt;/b&gt;&lt;p&gt;Reiniciar la shell para el lenguaje actualmente seleccionado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation>Restaurar y Limpiar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation>Limpiar la ventana y reiniciar la shell</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation>Limpiar la ventana y reiniciar la shell</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Reiniciar y Limpiar&lt;/b&gt;&lt;p&gt;Limpiar la ventana de shell y reiniciar la shell para el lenguaje actualmente seleccionado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation>Mostrar Historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation>Mostrar &amp;Historial...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation>Mostrar el historial de shell en un diálogo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation>Limpiar Historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation>&amp;Limpiar Historial...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation>Limpiar el historial de shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation>Seleccionar Entrada del Historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation>Seleccionar &amp;Entrada del Historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation>Seleccionar una entrada del historial de shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation>Mostrar información acerca de este software</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation>Mostrar información acerca de este software</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Acerca de&lt;/b&gt;&lt;p&gt;Mostrar información acerca de este software.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation>Acerca de Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation>Acerca de &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation>Mostrar información sobre las herramientas Qt</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation>Mostrar información sobre las herramientas Qt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Acerca de Qt&lt;/b&gt;&lt;p&gt;Mostrar información sobre las herramientas Qt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation>¿Qué es esto?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation>¿&amp;Qué es esto?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation>Shift+F1</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation>Ayuda sensible al contexto</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Mostrar ayuda sensible al contexto&lt;/b&gt;&lt;p&gt;En modo ¿Qué es esto? el puntero del ratón muestra una flecha con un interrogante, y se puede hacer click en elementos de la interfaz gráfica para obtener una descripción corta de lo que hacen y de cómo se utilizan. En los diálogos, se puede acceder a esta característica utilizando el botón de ayuda de contexto en la barra de título.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation>Acerca de la Ventana de Shell de eric6</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation>La Shell de eric6 es una ventana de shell autocontenida. Usa el mismo backend que el depurador de la IDE completa, pero se ejecuta independientemente.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation>&amp;Historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation>&amp;Iniciar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation>A&amp;yuda</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation>Historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Esta zona de la barra de estado permite hacer zoom de la shell.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation>Mover hacia adelante una entrada del historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation>Mover hacia atrás una entrada del historial</translation>
     </message>
--- a/i18n/eric6_fr.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_fr.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -40802,27 +40802,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51117,57 +51117,57 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation>Shell - Passif</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
+        <location filename="../QScintilla/Shell.py" line="250"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Passif &gt;&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation>Réinitialiser</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation>Effacer et réinitialiser</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation>Erreur de suppression</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation>Non.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
+        <location filename="../QScintilla/Shell.py" line="266"/>
         <source>Start</source>
         <translation>Lancer...</translation>
     </message>
@@ -51177,84 +51177,84 @@
         <translation type="obsolete">&lt;b&gt;La fenêtre Shell&lt;/b&gt;&lt;p&gt;Il s&apos;agit simplement d&apos;un interpreteur Python affiché dans une fenêtre. L&apos;interpréteur affiché est celui utilisé pour le débogage du programme en cours .Cela signifie qu&apos;on peut exécuter n&apos;importe quelle commande durant le débogage, en utilisant l&apos;environnement de débug en cours.&lt;/p&gt;&lt;p&gt;On peut utiliser les flèches pour rappeler les commandes enregistrées dans l&apos;historique. En appuyant sur les flèches du haut et du bas, on peut aussi rappeler les commandes qui commencent par le début du mot tapé..&lt;/p&gt;&lt;p&gt;Le shell possède des commandes spéciales. &apos;Réinitialiser&apos; tue le shell en cours et en redémarre un nouveau. &apos;Effacer&apos; efface l&apos;affichage, et &apos;Lancer...&apos; est utilisé pour basculer d&apos;un langage shell à l&apos;autre (&apos;Python&apos; ou &apos;Ruby&apos;). Ces commandes sont aussi disponibles via le menu contextuel du shell.&lt;/p&gt;&lt;p&gt;En appuyant sur la touche Tab après avoir saisi du texte, on affiche la liste des complétions possibles. L&apos;entrée voulue peut être sélectionnée dans la liste. Si une seule entrée est disponible, elle sera sélectionnée automatiquement.&lt;/p&gt;&lt;p&gt;En mode débogage passif, le shell est  disponible uniquement après que le programme débogué connecté à l&apos;IDE a été terminé. Ceci est indiqué par une invite de commande différente et par une indication dans le titre de la fenêtre.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation>Mode débogueur passif</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
+        <location filename="../QScintilla/Shell.py" line="271"/>
         <source>History</source>
         <translation>Historique</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
+        <location filename="../QScintilla/Shell.py" line="272"/>
         <source>Select entry</source>
         <translation>Sélection d&apos;une entrée</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="250"/>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation>Afficher</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation>Historique</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Sélectionner une entrée à executer (la plus récente est à la fin).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation>Non connexté</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation>Configuration...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation type="unfinished">Couper</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -51262,38 +51262,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="126"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51392,12 +51392,12 @@
         <translation>Retour à la ligne automatique</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation>Max. Historique:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation>Entrer le nombre d&apos;entrées maximum pour l&apos;historique</translation>
     </message>
@@ -51417,334 +51417,390 @@
         <translation>Analyse syntaxique activée</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation type="unfinished">Police</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation type="unfinished">Cliquer pour choisir une police monospacée 
 (les caractères auront tous la même largeur)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
         <source>Monospaced Font</source>
         <translation type="unfinished">Police monospacée</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation type="unfinished">Texte monospacé</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation type="unfinished">Cocher pour utiliser une police monospacée par défaut</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation type="unfinished">Police monospacée par défaut</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation type="unfinished">Police des numéros de ligne</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation type="unfinished">2345</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation type="unfinished">Historique</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation type="unfinished">Texte monospacé</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation type="unfinished">Cocher pour utiliser une police monospacée par défaut</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation type="unfinished">Police monospacée par défaut</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation type="unfinished">Police des numéros de ligne</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
-        <translation type="unfinished">2345</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation type="unfinished">Désactivé</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation type="unfinished">Quitter</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation type="unfinished">Quitter l&apos;IDE</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation type="unfinished">Nouvelle fenêtre</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
-        <source>Open a new Shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <source>Open a new Shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation type="unfinished">À propos de</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation type="unfinished">&amp;À propos de </translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation type="unfinished">Affiche les informations concernant le logiciel</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation type="unfinished">Affiche les informations concernant le logiciel</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;À propos de&lt;/b&gt;&lt;p&gt;Affiche certaines informations concernant le logiciel.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation type="unfinished">À propos de Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation type="unfinished">À propos de &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation type="unfinished">Affiche les informations concernant Qt</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation type="unfinished">Affiche les informations concernant Qt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;À propos de Qt&lt;/b&gt;&lt;p&gt;Affiche les informations concernant Qt&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation type="unfinished">Qu&apos;est-ce que c&apos;est ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation type="unfinished">&amp;Qu&apos;est-ce que c&apos;est?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation type="unfinished">Shift+F1</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation type="unfinished">Aide contextuelle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Affiche l&apos;aide contextuelle&lt;/b&gt;&lt;p&gt;Dans le mode &quot;Qu&apos;est-ce que c&apos;est?&quot;, la souris est affichée avec un point d&apos;interrogation, et on peut cliquer sur les éléments de  l&apos;interface pour obtenir une courte description de l&apos;élément. Cette fonction peut être obtenue avec le bouton d&apos;aide contextuelle de la barre principale.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edition</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation type="unfinished">&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation type="unfinished">&amp;Lancer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation type="unfinished">A&amp;ide</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation type="unfinished">Affichage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation type="unfinished">Historique</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation type="unfinished">Aide</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51754,7 +51810,7 @@
         <translation type="obsolete">Ctrl+Down</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_it.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -41261,27 +41261,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51590,57 +51590,57 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation>Shell - Passive</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
+        <location filename="../QScintilla/Shell.py" line="250"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Passivo &apos;&gt;&gt;&gt;&apos;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation>Pulisci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation>Resetta</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation>Resetta e pulisci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation>Drop Error</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
+        <location filename="../QScintilla/Shell.py" line="266"/>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
@@ -51650,86 +51650,86 @@
         <translation type="obsolete">&lt;b&gt;La finestra Shell&lt;/b&gt;&lt;p&gt;Questo è un semplice interprete che viene eseguito in una finestra. L&apos;interprete è quello usato per eseguire il programma sotto debug. Significa che puoi eseguire qualsiasi comando mentre il programma in debug viene eseguito.&lt;/p&gt;&lt;p&gt;Puoi usare i tasti cursore mentre inserisci i comandi. C&apos;è inoltre una cronologia dei comandi che può essere richiamata usando i tanti su e giù. Premendo i tasti su e giù dopo che del testo è stato inserito verrà avviata una ricerca incrementale.&lt;/p&gt;&lt;p&gt;La shell ha alcuni comandi speciali. &apos;reset&apos; uccide la shell e ne avvia una nuova. &apos;clear&apos; pulisce la finestra della shell. &apos;start&apos; è usato per cambiare il linguaggio della shell e deve essere seguito da uno dei linguaggi supportati. I linguaggi supportati sono elencati dal comando &apos;languages&apos;. Questi comandi (eccetto &apos;languages&apos;) sono disponibili tramite un menù contestuale.&lt;/p&gt;&lt;p&gt;Premendo il tasto Tab dopo aver inserito del testo verrà mostrata una lista di possibili comandi. L&apos;elemento rilevante può essere selezionato dalla lista. Se solo un elemento è disponibile, sarà inserito automaticamente.&lt;/p&gt;&lt;p&gt;In modalità di debug passiva la shell è disponibile solo dopo che il programma debuggato si è connesso all&apos;IDE fino a quando è terminato. Questo viene indicato da un prompt differente e dal titolo della finestra.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation>Passive Debug Mode</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
+        <location filename="../QScintilla/Shell.py" line="271"/>
         <source>History</source>
         <translation>Cronologia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
+        <location filename="../QScintilla/Shell.py" line="272"/>
         <source>Select entry</source>
         <translation>Seleziona elemento</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="250"/>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation>Selezione cronologia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Seleziona l&apos;elemento dalla cronologia da esegurie (i più recenti sono gli ultimi).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation>
 Non connesso</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation>Configura...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation>Taglia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Il linguaggio &quot;{0}&quot; della shell non è supportato.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; non è un file.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -51737,38 +51737,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="126"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51863,12 +51863,12 @@
         <translation>Impaginazione parole abilitata</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation>Numero massimo elementi nella cronologia:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation>Inserisci il numero di elementi nella cronologia consentiti</translation>
     </message>
@@ -51888,333 +51888,389 @@
         <translation>Evidenziazione sintassi abilitata</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation>Selezione per mostrare lo stdout e stderr del debug</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation>Mostra stdout e stderr del debuggato</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation>Premi per selezionare un font da usare a larghezza fissa</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
+        <source>Monospaced Font</source>
+        <translation>Font a larghezza fissa</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation>Testo prespaziato</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation>Seleziona, nel caso il font prespaziato debba essere usato come default</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation>Usa font prespaziato come default</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation>Font Numeri linea</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation>2345</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation>Premi per selezione il font per i numeri di linea</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation type="unfinished">Cronologia</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
-        <source>Monospaced Font</source>
-        <translation>Font a larghezza fissa</translation>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation>Testo prespaziato</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation>Seleziona, nel caso il font prespaziato debba essere usato come default</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation>Usa font prespaziato come default</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation>Font Numeri linea</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
-        <translation>2345</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
-        <translation>Premi per selezione il font per i numeri di linea</translation>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation type="unfinished">Disabilitato</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation type="unfinished">Esci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Esci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation type="unfinished">Esci dall&apos;IDE</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation type="unfinished">Nuova finestra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation type="unfinished">Nuova &amp;Finestra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
-        <source>Open a new Shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <source>Open a new Shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation type="unfinished">Riavvio</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation type="unfinished">Pulisci la history</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation type="unfinished">About</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Mostra alcune informazioni su questo software.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation type="unfinished">Cos&apos;è questo ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation type="unfinished">C&amp;os&apos;è Questo ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation type="unfinished">Shift+F1</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation type="unfinished">Help sensibile al contesto</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;File</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edita</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation type="unfinished">&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation type="unfinished">&amp;Avvia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation type="unfinished">Trova</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation type="unfinished">Visualizza</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation type="unfinished">Cronologia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation type="unfinished">Aiuto</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52224,7 +52280,7 @@
         <translation type="obsolete">Ctrl+Down</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_pt.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_pt.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -41396,27 +41396,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Selecionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Selecionar o intérprete de Python{0} a usar:</translation>
     </message>
@@ -51577,139 +51577,139 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
-        <source>Passive &gt;&gt;&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
-        <source>Start</source>
-        <translation>Iniciar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
-        <source>History</source>
-        <translation>Historial</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
-        <source>Select entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="250"/>
+        <source>Passive &gt;&gt;&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="266"/>
+        <source>Start</source>
+        <translation>Iniciar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="271"/>
+        <source>History</source>
+        <translation>Historial</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="272"/>
+        <source>Select entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation type="unfinished">Reinicializar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation>Desconetado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation>Nº</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; não é um ficheiro.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation>Encontrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -51717,38 +51717,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="126"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
-        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51858,348 +51858,404 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation>max. Entradas Histórico:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation>Introduzir o número de entradas de histórico permitido</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation>Tipo de Letra</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation type="unfinished">Pressionar para selecionar a letra a usar como letra de espaçamento uniforme</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
+        <source>Monospaced Font</source>
+        <translation>Letra Espaçamento Uniforme</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation>Texto Espaçamento Uniforme</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation type="unfinished">Selecionar para usar letras de espaçamento uniforme por predefinição</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation type="unfinished">Usar espaçamento uniforme por predefinição</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation>Letra dos Números de Linha</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
-        <source>Monospaced Font</source>
-        <translation>Letra Espaçamento Uniforme</translation>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation>Texto Espaçamento Uniforme</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation type="unfinished">Selecionar para usar letras de espaçamento uniforme por predefinição</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation type="unfinished">Usar espaçamento uniforme por predefinição</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation>Letra dos Números de Linha</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
-        <translation></translation>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation type="unfinished">Inabilitado</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation type="unfinished">Sair</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">Sai&amp;r</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation type="unfinished">Sair do IDE</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation type="unfinished">Nova Janela</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation type="unfinished">Nova &amp;Janela</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation type="unfinished">Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
+        <location filename="../QScintilla/ShellWindow.py" line="211"/>
         <source>Open a new Shell window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation type="unfinished">Reiniciar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation type="unfinished">Limpar Histórico</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation type="unfinished">Acerca</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation type="unfinished">A&amp;cerca</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation type="unfinished">Mostra a informação acerca deste software</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation type="unfinished">Mostra a informação acerca deste software</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Acerca&lt;/b&gt;&lt;p&gt;Mostra alguma informação acerca deste software.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation type="unfinished">Acerca de Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation type="unfinished">Acerca de &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation type="unfinished">Mostra informação acerca das Ferramentas de Qt</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation type="unfinished">Mostra informação acerca das Ferramentas de Qt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Acerca de Qt&lt;/b&gt;&lt;p&gt;Mostra alguma informação acerca das Ferramentas de Qt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation type="unfinished">Shift+F1</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation type="unfinished">Ajuda sensível ao contexto</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;b&gt;Mostrar ajuda sensível a contexto&lt;/b&gt;&lt;p&gt;No modo &apos;Que é Isto?&apos; o cursor do rato mostra uma flecha com um ponto de  interrogação, e pode clicar nos elementos da interface para ver uma breve descrição do que fazem e como se usam. Nas caixas de diálogo, pode-se aceder a esta característica através do botão de ajuda contextual da barra de título.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation type="unfinished">&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation type="unfinished">&amp;Iniciar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation type="unfinished">Ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation type="unfinished">Encontrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation type="unfinished">Vista</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation type="unfinished">Ajuda</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_ru.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_ru.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -40198,27 +40198,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Задайте интерпретатор Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Задайте интерпретатор Python{0}:</translation>
     </message>
@@ -50566,141 +50566,141 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation>Пассивная оболочка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation>Оболочка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
-        <source>Passive &gt;&gt;&gt; </source>
-        <translation>Пассивная &gt;&gt;&gt; </translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
-        <source>Start</source>
-        <translation>Начать</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
-        <source>History</source>
-        <translation>История</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
-        <source>Select entry</source>
-        <translation>Выбрать</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="250"/>
+        <source>Passive &gt;&gt;&gt; </source>
+        <translation>Пассивная &gt;&gt;&gt; </translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="266"/>
+        <source>Start</source>
+        <translation>Начать</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="271"/>
+        <source>History</source>
+        <translation>История</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="272"/>
+        <source>Select entry</source>
+        <translation>Выбрать</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation>Сбросить и очистить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation>Настроить...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation>Выберите историю</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Выберите одну из предыдущих команд для выполнения.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation>Режим пассивной отладки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation>
 Нет соединения</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation>Нет.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} в {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Язык оболочки &quot;{0}&quot; не поддерживается.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation>Ошибка Drag&amp;&amp;Drop</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; не является файлом&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="260"/>
+        <location filename="../QScintilla/Shell.py" line="284"/>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="743"/>
+        <location filename="../QScintilla/Shell.py" line="834"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -50711,14 +50711,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="776"/>
+        <location filename="../QScintilla/Shell.py" line="867"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Неизвестная синтакcическая ошибка.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="753"/>
+        <location filename="../QScintilla/Shell.py" line="844"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -50727,14 +50727,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="778"/>
+        <location filename="../QScintilla/Shell.py" line="869"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Синтаксическая ошибка &quot;{1}&quot; в файле {0} в строке {2}, символ {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="801"/>
+        <location filename="../QScintilla/Shell.py" line="892"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Сигнал &quot;{0}&quot; сгенерирован в файле {1} в строке {2}.
@@ -50743,12 +50743,22 @@
     <message>
         <location filename="../QScintilla/Shell.py" line="126"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Окно оболочки&lt;/b&gt;&lt;p&gt;Вы можете использовать клавиши управления курсором при вводе команд. Так же существует история команд, которые можно вызвать с помощью клавиш курсора &apos;вверх&apos; и &apos;вниз&apos;. Нажатие клавиши &apos;вверх&apos; или &apos;вниз&apos; после ввода какого-либо текста вызовет инкрементный поиск.&lt;/p&gt;&lt;p&gt;Оболочка имеет специальные команды. Команда &apos;reset&apos; убивает текущую оболочку и открывает новую. Команда &apos;clear&apos; очищает окно оболочки. Команда &apos;start&apos; используется для переключения языка оболочки и должна сопровождаться поддерживаемым языком. Поддерживаемые языки отображаются с помощью команды &apos;languages&apos;. Команда &apos;quit&apos; используется для выхода из приложения. Эти команды (исключая &apos;languages&apos;) также доступны в оконных меню.&lt;/p&gt;&lt;p&gt;Нажатие клавиши &apos;Tab&apos;, после того, как был введен какой-либо текст, вызывает отображение списка возможных дополнений. Необходимая запись может быть выбрана из данного списка. Если доступна только одна запись, то она будет вставлена автоматически.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Окно оболочки&lt;/b&gt;&lt;p&gt;Вы можете использовать клавиши управления курсором при вводе команд. Так же существует история команд, которые можно вызвать с помощью клавиш курсора &apos;вверх&apos; и &apos;вниз&apos;. Нажатие клавиши &apos;вверх&apos; или &apos;вниз&apos; после ввода какого-либо текста вызовет инкрементный поиск.&lt;/p&gt;&lt;p&gt;Оболочка имеет специальные команды. Команда &apos;reset&apos; убивает текущую оболочку и открывает новую. Команда &apos;clear&apos; очищает окно оболочки. Команда &apos;start&apos; используется для переключения языка оболочки и должна сопровождаться поддерживаемым языком. Поддерживаемые языки отображаются с помощью команды &apos;languages&apos;. Команда &apos;quit&apos; используется для выхода из приложения. Эти команды (исключая &apos;languages&apos;) также доступны в оконных меню.&lt;/p&gt;&lt;p&gt;Нажатие клавиши &apos;Tab&apos;, после того, как был введен какой-либо текст, вызывает отображение списка возможных дополнений. Необходимая запись может быть выбрана из данного списка. Если доступна только одна запись, то она будет вставлена автоматически.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../QScintilla/Shell.py" line="147"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Pressing the up or down key after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Окно оболочки&lt;/b&gt;&lt;p&gt;Это простой интерпретатор, запущенный в окне. Интерпретатор просто используется для запуска отлаживаемой программы. Это означает, что вы можете выполнить любую команду во время работы отлаживаемой программы.&lt;/p&gt;&lt;p&gt;Вы можете использовать клавиши управления курсором при вводе команд. Так же существует история команд, которые можно вызвать с помощью клавиш управления курсора &apos;вверх&apos; и &apos;вниз&apos;. Нажатие клавиши &apos;вверх&apos; или &apos;вниз&apos; после ввода какого-либо текста вызовет инкрементный поиск.&lt;/p&gt;&lt;p&gt;Оболочка имеет специальные команды. Команда &apos;reset&apos; убивает текущую оболочку и открывает новую. Команда &apos;clear&apos; очищает окно оболочки. Команда &apos;start&apos; используется для переключения языка оболочки и должна сопровождаться поддерживаемым языком. Поддерживаемые языки отображаются с помощью команды &apos;languages&apos;. Команда &apos;quit&apos; используется для выхода из приложения. Эти команды (исключая &apos;languages&apos;) также доступны в оконных меню.&lt;/p&gt;&lt;p&gt;Нажатие клавиши &apos;Tab&apos;  после того, как был введен какой-либо текст, вызывает отображение списка возможных дополнений. Необходимая запись может быть выбрана из данного списка. Если доступна только одна запись, то она будет вставлена автоматически.&lt;/p&gt;&lt;p&gt;В режиме пассивной отладки оболочка доступна только после того, как отлаживаемая программа была подключена к IDE и до ее завершения. Это указывается посредством другой подсказки и индикацией в заголовке окна.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Окно оболочки&lt;/b&gt;&lt;p&gt;Это простой интерпретатор, запущенный в окне. Интерпретатор просто используется для запуска отлаживаемой программы. Это означает, что вы можете выполнить любую команду во время работы отлаживаемой программы.&lt;/p&gt;&lt;p&gt;Вы можете использовать клавиши управления курсором при вводе команд. Так же существует история команд, которые можно вызвать с помощью клавиш управления курсора &apos;вверх&apos; и &apos;вниз&apos;. Нажатие клавиши &apos;вверх&apos; или &apos;вниз&apos; после ввода какого-либо текста вызовет инкрементный поиск.&lt;/p&gt;&lt;p&gt;Оболочка имеет специальные команды. Команда &apos;reset&apos; убивает текущую оболочку и открывает новую. Команда &apos;clear&apos; очищает окно оболочки. Команда &apos;start&apos; используется для переключения языка оболочки и должна сопровождаться поддерживаемым языком. Поддерживаемые языки отображаются с помощью команды &apos;languages&apos;. Команда &apos;quit&apos; используется для выхода из приложения. Эти команды (исключая &apos;languages&apos;) также доступны в оконных меню.&lt;/p&gt;&lt;p&gt;Нажатие клавиши &apos;Tab&apos;  после того, как был введен какой-либо текст, вызывает отображение списка возможных дополнений. Необходимая запись может быть выбрана из данного списка. Если доступна только одна запись, то она будет вставлена автоматически.&lt;/p&gt;&lt;p&gt;В режиме пассивной отладки оболочка доступна только после того, как отлаживаемая программа была подключена к IDE и до ее завершения. Это указывается посредством другой подсказки и индикацией в заголовке окна.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="143"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="166"/>
+        <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -50857,348 +50867,404 @@
         <translation>Разрешить подсветку синтаксиса</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="93"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="97"/>
         <source>max. History Entries:</source>
         <translation>Макс. количество строк истории:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="100"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="104"/>
         <source>Enter the number of history entries allowed</source>
         <translation>Задайте количество допустимых строк истории</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="137"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="260"/>
         <source>Select to show debuggee stdout and stderr</source>
         <translation>Разрешить показывать stdout и stderr отлаживаемой программы</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="140"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="263"/>
         <source>Show stdout and stderr of debuggee</source>
         <translation>Показывать stdout и stderr отлаживаемой программы</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="147"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="183"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
         <source>Press to select the font to be used as the monospaced font</source>
         <translation>Задать шрифт, который будет использоваться как моноширинный</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
+        <source>Monospaced Font</source>
+        <translation>Моноширинный шрифт</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="202"/>
+        <source>Monospaced Text</source>
+        <translation>Моноширинный текст</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="215"/>
+        <source>Select, whether the monospaced font should be used as default</source>
+        <translation>Разрешить использовать по умолчанию моноширинный шрифт</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="218"/>
+        <source>Use monospaced as default</source>
+        <translation>Использовать моноширинный шрифт по умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="225"/>
+        <source>Press to select the font for the line numbers</source>
+        <translation>Выбрать шрифт для номеров строк</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="228"/>
+        <source>Line Numbers Font</source>
+        <translation>Шрифт для номеров строк</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="244"/>
+        <source>2345</source>
+        <translation>2345</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="91"/>
+        <source>History</source>
+        <translation type="unfinished">История</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="142"/>
+        <source>Navigation Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="149"/>
+        <source>Select the history style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="156"/>
-        <source>Monospaced Font</source>
-        <translation>Моноширинный шрифт</translation>
+        <source>Select to wrap around while navigating through the history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="159"/>
+        <source>Wrap around while navigating</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="166"/>
-        <source>Monospaced Text</source>
-        <translation>Моноширинный текст</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="179"/>
-        <source>Select, whether the monospaced font should be used as default</source>
-        <translation>Разрешить использовать по умолчанию моноширинный шрифт</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="182"/>
-        <source>Use monospaced as default</source>
-        <translation>Использовать моноширинный шрифт по умолчанию</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="189"/>
-        <source>Press to select the font for the line numbers</source>
-        <translation>Выбрать шрифт для номеров строк</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="192"/>
-        <source>Line Numbers Font</source>
-        <translation>Шрифт для номеров строк</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="208"/>
-        <source>2345</source>
-        <translation>2345</translation>
+        <source>Select to make Up- and Down-keys move in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="169"/>
+        <source>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.ui" line="173"/>
+        <source>Up/Down keys navigate in history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="40"/>
+        <source>Disabled</source>
+        <translation type="unfinished">Отключена</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="42"/>
+        <source>Linux Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ShellPage.py" line="44"/>
+        <source>Windows Style</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShellWindow</name>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>&amp;Quit</source>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="188"/>
+        <location filename="../QScintilla/ShellWindow.py" line="190"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="196"/>
         <source>Quit the Shell</source>
         <translation>Выход из оболочки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="195"/>
+        <location filename="../QScintilla/ShellWindow.py" line="197"/>
         <source>&lt;b&gt;Quit the Shell&lt;/b&gt;&lt;p&gt;This quits the Shell window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Выход из оболочки&lt;/b&gt;&lt;p&gt;Это действие позволяет выйти из окна оболочки.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New Window</source>
         <translation>Новое окно</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>New &amp;Window</source>
         <translation>&amp;Новое окно</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="205"/>
         <source>Ctrl+Shift+N</source>
         <comment>File|New Window</comment>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="209"/>
+        <location filename="../QScintilla/ShellWindow.py" line="211"/>
         <source>Open a new Shell window</source>
         <translation>Открыть новое окно оболочки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="213"/>
         <source>&lt;b&gt;New Window&lt;/b&gt;&lt;p&gt;This opens a new instance of the Shell window.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Новое окно&lt;/b&gt;&lt;p&gt;Открытие нового экземпляра окна оболочки.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="218"/>
+        <location filename="../QScintilla/ShellWindow.py" line="220"/>
         <source>Restart</source>
         <translation>Перезапуск</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="223"/>
-        <source>Restart the shell</source>
-        <translation>Перезапуск оболочки</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="225"/>
+        <source>Restart the shell</source>
+        <translation>Перезапуск оболочки</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="227"/>
         <source>&lt;b&gt;Restart&lt;/b&gt;&lt;p&gt;Restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Перезапуск&lt;/b&gt;&lt;p&gt;Перезапуск оболочки для текущего выбранного языка.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="234"/>
         <source>Restart and Clear</source>
         <translation>Перезапустить и очистить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="237"/>
-        <source>Clear the window and restart the shell</source>
-        <translation>Очистить окно и перезапустить оболочку</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="239"/>
+        <source>Clear the window and restart the shell</source>
+        <translation>Очистить окно и перезапустить оболочку</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="241"/>
         <source>&lt;b&gt;Restart and Clear&lt;/b&gt;&lt;p&gt;Clear the shell window and restart the shell for the currently selected language.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Перезапустить и очистить&lt;/b&gt;&lt;p&gt;Очистка окна оболочки и перезапуск оболочки для выбранного языка.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>Show History</source>
         <translation>Показать историю</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="874"/>
+        <location filename="../QScintilla/ShellWindow.py" line="876"/>
         <source>&amp;Show History...</source>
         <translation>&amp;Показать историю...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="880"/>
+        <location filename="../QScintilla/ShellWindow.py" line="882"/>
         <source>Show the shell history in a dialog</source>
         <translation>Отображение истории оболочки в диалоговом окне</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>Clear History</source>
         <translation>Очистить историю</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="884"/>
+        <location filename="../QScintilla/ShellWindow.py" line="886"/>
         <source>&amp;Clear History...</source>
         <translation>&amp;Очистить историю...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="890"/>
+        <location filename="../QScintilla/ShellWindow.py" line="892"/>
         <source>Clear the shell history</source>
         <translation>Очистить историю оболочки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History Entry</source>
         <translation>Выбрать запись в истории</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="894"/>
+        <location filename="../QScintilla/ShellWindow.py" line="896"/>
         <source>Select History &amp;Entry</source>
         <translation>Выбрать &amp;запись в истории</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="899"/>
+        <location filename="../QScintilla/ShellWindow.py" line="901"/>
         <source>Select an entry of the shell history</source>
         <translation>Выбор записи в истории оболочки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="907"/>
+        <location filename="../QScintilla/ShellWindow.py" line="909"/>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="911"/>
-        <source>Display information about this software</source>
-        <translation>Информация об этой  программе</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="913"/>
+        <source>Display information about this software</source>
+        <translation>Информация об этой  программе</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="915"/>
         <source>&lt;b&gt;About&lt;/b&gt;&lt;p&gt;Display some information about this software.&lt;/p&gt;</source>
         <translation>&lt;b&gt;О программе&lt;/b&gt;&lt;p&gt;Информация об этом программном продукте.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="919"/>
+        <location filename="../QScintilla/ShellWindow.py" line="921"/>
         <source>About &amp;Qt</source>
         <translation>О &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="923"/>
-        <source>Display information about the Qt toolkit</source>
-        <translation>Информация о наборе инструментов Qt</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/ShellWindow.py" line="925"/>
+        <source>Display information about the Qt toolkit</source>
+        <translation>Информация о наборе инструментов Qt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/ShellWindow.py" line="927"/>
         <source>&lt;b&gt;About Qt&lt;/b&gt;&lt;p&gt;Display some information about the Qt toolkit.&lt;/p&gt;</source>
         <translation>&lt;b&gt;О Qt&lt;/b&gt;&lt;p&gt;Отображение информация об инструментарии Qt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>What&apos;s This?</source>
         <translation>Что это?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>&amp;What&apos;s This?</source>
         <translation>&amp;Что это?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="932"/>
+        <location filename="../QScintilla/ShellWindow.py" line="934"/>
         <source>Shift+F1</source>
         <comment>Help|What&apos;s This?&apos;</comment>
         <translation>Shift+F1</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="938"/>
+        <location filename="../QScintilla/ShellWindow.py" line="940"/>
         <source>Context sensitive help</source>
         <translation>Контекстнозависимая справка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="939"/>
+        <location filename="../QScintilla/ShellWindow.py" line="941"/>
         <source>&lt;b&gt;Display context sensitive help&lt;/b&gt;&lt;p&gt;In What&apos;s This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Показ контекстнозависимой справки&lt;/b&gt; &lt;p&gt;В режиме &quot;What&apos;s This?&quot;(Что это?)курсор мыши отображается как стрелка со знаком вопроса, и вы можете, кликнув по элементу интерфейса, получить краткое описание того, что он делает и как его использовать. В диалоговом окне эта функция может быть вызвана кнопкой контекстной справки в панели заголовка.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>About eric6 Shell Window</source>
         <translation>Об окне оболочки eric6</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1075"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1077"/>
         <source>The eric6 Shell is a standalone shell window. It uses the same backend as the debugger of the full IDE, but is executed independently.</source>
         <translation>Оболочка eric6 - автономное окно оболочки. Оно использует тот же бэкэнд что и отладчик полной IDE, но только исполняется независимо.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1103"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1105"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1112"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1114"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1123"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1125"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1130"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1132"/>
         <source>Histor&amp;y</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1136"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1139"/>
         <source>&amp;Start</source>
         <translation>&amp;Начать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1142"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1145"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1177"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1180"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1186"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1189"/>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1193"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1196"/>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1199"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1202"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1206"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1209"/>
         <source>History</source>
         <translation>История</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1211"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1215"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1232"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1236"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation>&lt;p&gt;В этой части строки состояния разрешено масштабирование оболочки.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="568"/>
+        <location filename="../QScintilla/ShellWindow.py" line="570"/>
         <source>Move forward one history entry</source>
         <translation>Переместить запись в истории вперед</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="578"/>
+        <location filename="../QScintilla/ShellWindow.py" line="580"/>
         <source>Move back one history entry</source>
         <translation>Переместить запись в истории назад</translation>
     </message>
--- a/i18n/eric6_tr.ts	Mon Jul 10 18:24:35 2017 +0200
+++ b/i18n/eric6_tr.ts	Mon Jul 10 18:48:33 2017 +0200
@@ -40852,27 +40852,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1578"/>
+        <location filename="../Preferences/__init__.py" line="1583"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1606"/>
+        <location filename="../Preferences/__init__.py" line="1611"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1713"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51032,12 +51032,12 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="121"/>
+        <location filename="../QScintilla/Shell.py" line="138"/>
         <source>Shell - Passive</source>
         <translation>Pasif- Kabuk</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="123"/>
+        <location filename="../QScintilla/Shell.py" line="140"/>
         <source>Shell</source>
         <translation>Kabuk</translation>
     </message>
@@ -51047,131 +51047,131 @@
         <translation type="obsolete">&lt;b&gt;Kabu Penceresi&lt;/b&gt;&lt;p&gt;Bu basit bir yorumlayıcı penceresidir. Koşturulan programın hata yakalamasının yapılacağı bir arayüzdür.Bunun anlamı programda hata yakalamaya başladığınızda kabuk üzerinden istediğiniz comutu girebileceğinizdir.&lt;/p&gt;&lt;p&gt;İmleç tuşları ile daha önceden girilen komutlar arasında dolaşabilirsiniz. Aşağı yada yukarı tuşlarına bastıktan sonra klavyeden gireceğiniz harf ve kelimelere göre arama başlatırsınız.&lt;/p&gt;&lt;p&gt;Kabuğun bazı özel komutları vardır. &apos;reset&apos;kabuğu sıfırlar ve yeni bir tane başlatır. &apos;clear&apos; kabuk penceresini temziler. &apos;start&apos;kullanılan kabuk dilinden bir sonraki kabuk diline geçirir. Desteklenen diller &apos;languages&apos; komutu ile listelenir. Bu komutlar (except &apos;languages&apos;) sağ tuş menusü ilede ulaşılabilir.&lt;/p&gt;&lt;p&gt;Bazı metinleri girdikten sonra tab tuşuna bazarsanız tamamlanabilecek kelimelerin bir listesi gelir. Konuyla ilgili kelimelri bu listede seçebilirsiniz.Eğer girilebilecek tek bir seçenek varsa , bu otomat,k olarak eklenir.&lt;/p&gt;&lt;p&gt; Pasif hata ayıklama modunda bu tamamlanana kadar IDLE kullanılamaz.Bu durum pencere başlığında farklı çıktılar ile gösterilir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="227"/>
+        <location filename="../QScintilla/Shell.py" line="250"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Pasif &gt;&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="243"/>
+        <location filename="../QScintilla/Shell.py" line="266"/>
         <source>Start</source>
         <translation>Başla</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="248"/>
+        <location filename="../QScintilla/Shell.py" line="271"/>
         <source>History</source>
         <translation>Geçmiş</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="249"/>
+        <location filename="../QScintilla/Shell.py" line="272"/>
         <source>Select entry</source>
         <translation>Girişi Seç</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="250"/>
+        <location filename="../QScintilla/Shell.py" line="273"/>
         <source>Show</source>
         <translation>Göster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="262"/>
+        <location filename="../QScintilla/Shell.py" line="286"/>
         <source>Clear</source>
         <translation>Temizle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="255"/>
+        <location filename="../QScintilla/Shell.py" line="278"/>
         <source>Cut</source>
         <translation>Kes</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="256"/>
+        <location filename="../QScintilla/Shell.py" line="279"/>
         <source>Copy</source>
         <translation>Kopyala</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="257"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Paste</source>
         <translation>Yapıştır</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="263"/>
+        <location filename="../QScintilla/Shell.py" line="287"/>
         <source>Reset</source>
         <translation>Başadön</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="264"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>Reset and Clear</source>
         <translation>Başadön ve temizle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="269"/>
+        <location filename="../QScintilla/Shell.py" line="293"/>
         <source>Configure...</source>
         <translation>Ayarlanıyor...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select History</source>
         <translation>Geçmişi Seç</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="632"/>
+        <location filename="../QScintilla/Shell.py" line="723"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>geçmişte yapılanları göster (ençok gösterilenleri seç).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="695"/>
+        <location filename="../QScintilla/Shell.py" line="786"/>
         <source>Passive Debug Mode</source>
         <translation>Pasif Hata Ayıklama Modu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="696"/>
+        <location filename="../QScintilla/Shell.py" line="787"/>
         <source>
 Not connected</source>
         <translation>
 Bağlantı yok</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="698"/>
+        <location filename="../QScintilla/Shell.py" line="789"/>
         <source>No.</source>
         <translation>NO.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="700"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} üzerin {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="934"/>
         <source>StdOut: {0}</source>
         <translation>Stdçıktı:{0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="851"/>
+        <location filename="../QScintilla/Shell.py" line="942"/>
         <source>StdErr: {0}</source>
         <translation>stdhata: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1482"/>
+        <location filename="../QScintilla/Shell.py" line="1637"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Kabuk dili &quot;{0}&quot; desteklenmiyor.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>
+        <location filename="../QScintilla/Shell.py" line="1951"/>
         <source>Drop Error</source>
         <translation>Düşme hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1772"/>