Added the capability to remember the most recently used file names and conditions.

Fri, 22 Dec 2017 17:56:49 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 22 Dec 2017 17:56:49 +0100
changeset 6034
4f88f70d2cd4
parent 6033
967b3e3e5b4d
child 6035
6cac9ce8ab15

Added the capability to remember the most recently used file names and conditions.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
Debugger/BreakPointViewer.py file | annotate | diff | comparison | revisions
Debugger/EditBreakpointDialog.py file | annotate | diff | comparison | revisions
Debugger/EditBreakpointDialog.ui 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.Debugger.BreakPointViewer.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Globals.__init__.html file | annotate | diff | comparison | revisions
Globals/__init__.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/DebuggerGeneralPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/DebuggerGeneralPage.ui file | annotate | diff | comparison | revisions
Preferences/__init__.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	Fri Dec 22 16:36:02 2017 +0100
+++ b/APIs/Python3/eric6.api	Fri Dec 22 17:56:49 2017 +0100
@@ -1672,6 +1672,8 @@
 eric6.Globals.isMacPlatform?4()
 eric6.Globals.isWindowsPlatform?4()
 eric6.Globals.qVersionTuple?4()
+eric6.Globals.recentNameBreakpointConditions?7
+eric6.Globals.recentNameBreakpointFiles?7
 eric6.Globals.recentNameFiles?7
 eric6.Globals.recentNameHexFiles?7
 eric6.Globals.recentNameHosts?7
--- a/Debugger/BreakPointViewer.py	Fri Dec 22 16:36:02 2017 +0100
+++ b/Debugger/BreakPointViewer.py	Fri Dec 22 17:56:49 2017 +0100
@@ -10,13 +10,16 @@
 from __future__ import unicode_literals
 
 from PyQt5.QtCore import pyqtSignal, Qt, QItemSelectionModel, \
-    QSortFilterProxyModel
+    QSortFilterProxyModel, QFileInfo
 from PyQt5.QtWidgets import QTreeView, QAbstractItemView, QHeaderView, QMenu, \
     QDialog
 
 from E5Gui.E5Application import e5App
 
-from Globals import qVersionTuple
+from Globals import qVersionTuple, recentNameBreakpointFiles, \
+    recentNameBreakpointConditions
+
+import Preferences
 
 
 class BreakPointViewer(QTreeView):
@@ -59,6 +62,8 @@
         self.fnHistory = []
         self.fnHistory.append('')
         
+        self.__loadRecent()
+        
     def setModel(self, model):
         """
         Public slot to set the breakpoint model.
@@ -248,6 +253,8 @@
                     self.condHistory.remove(cond)
                 self.condHistory.insert(0, cond)
             
+            self.__saveRecent()
+            
             self.__model.addBreakPoint(fn, line, (cond, temp, enabled, count))
             self.__resizeColumns()
             self.__resort()
@@ -293,6 +300,8 @@
                     if cond in self.condHistory:
                         self.condHistory.remove(cond)
                     self.condHistory.insert(0, cond)
+                    
+                    self.__saveRecent()
                 
                 self.__model.setBreakPointByIndex(
                     sindex, fn, line, (cond, temp, enabled, count))
@@ -463,3 +472,38 @@
         """
         e5App().getObject("UserInterface").showPreferences(
             "debuggerGeneralPage")
+    
+    def __loadRecent(self):
+        """
+        Private method to load the recently used file names.
+        """
+        Preferences.Prefs.rsettings.sync()
+        
+        # load recently used file names
+        self.fnHistory = []
+        self.fnHistory.append('')
+        rs = Preferences.Prefs.rsettings.value(recentNameBreakpointFiles)
+        if rs is not None:
+            recent = [f
+                      for f in Preferences.toList(rs)
+                      if QFileInfo(f).exists()]
+            self.fnHistory.extend(
+                recent[:Preferences.getDebugger("RecentNumber")])
+        
+        # load recently entered condition expressions
+        self.condHistory = []
+        rs = Preferences.Prefs.rsettings.value(recentNameBreakpointConditions)
+        if rs is not None:
+            self.condHistory = \
+                Preferences.toList(rs)[
+                    :Preferences.getDebugger("RecentNumber")]
+    
+    def __saveRecent(self):
+        """
+        Private method to save the list of recently used file names.
+        """
+        recent = [f for f in self.fnHistory if f]
+        Preferences.Prefs.rsettings.setValue(recentNameBreakpointFiles, recent)
+        Preferences.Prefs.rsettings.setValue(recentNameBreakpointConditions,
+                                             self.condHistory)
+        Preferences.Prefs.rsettings.sync()
--- a/Debugger/EditBreakpointDialog.py	Fri Dec 22 16:36:02 2017 +0100
+++ b/Debugger/EditBreakpointDialog.py	Fri Dec 22 17:56:49 2017 +0100
@@ -11,7 +11,7 @@
 
 import os.path
 
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QComboBox
 
 from E5Gui.E5PathPicker import E5PathPickerModes
 
@@ -46,6 +46,8 @@
         self.setModal(modal)
         
         self.filenamePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.filenamePicker.setSizeAdjustPolicy(
+            QComboBox.AdjustToMinimumContentsLength)
         
         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
         
--- a/Debugger/EditBreakpointDialog.ui	Fri Dec 22 16:36:02 2017 +0100
+++ b/Debugger/EditBreakpointDialog.ui	Fri Dec 22 17:56:49 2017 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>428</width>
-    <height>207</height>
+    <height>226</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -97,6 +97,9 @@
      <property name="editable">
       <bool>true</bool>
      </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+     </property>
     </widget>
    </item>
    <item row="3" column="0">
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Fri Dec 22 16:36:02 2017 +0100
+++ b/Documentation/Help/source.qhp	Fri Dec 22 17:56:49 2017 +0100
@@ -2537,8 +2537,10 @@
       <keyword name="BreakPointViewer.__fromSourceIndex" id="BreakPointViewer.__fromSourceIndex" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__fromSourceIndex" />
       <keyword name="BreakPointViewer.__getSelectedItemsCount" id="BreakPointViewer.__getSelectedItemsCount" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__getSelectedItemsCount" />
       <keyword name="BreakPointViewer.__layoutDisplay" id="BreakPointViewer.__layoutDisplay" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__layoutDisplay" />
+      <keyword name="BreakPointViewer.__loadRecent" id="BreakPointViewer.__loadRecent" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__loadRecent" />
       <keyword name="BreakPointViewer.__resizeColumns" id="BreakPointViewer.__resizeColumns" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__resizeColumns" />
       <keyword name="BreakPointViewer.__resort" id="BreakPointViewer.__resort" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__resort" />
+      <keyword name="BreakPointViewer.__saveRecent" id="BreakPointViewer.__saveRecent" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__saveRecent" />
       <keyword name="BreakPointViewer.__setBpEnabled" id="BreakPointViewer.__setBpEnabled" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__setBpEnabled" />
       <keyword name="BreakPointViewer.__setRowSelected" id="BreakPointViewer.__setRowSelected" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__setRowSelected" />
       <keyword name="BreakPointViewer.__showBackMenu" id="BreakPointViewer.__showBackMenu" ref="eric6.Debugger.BreakPointViewer.html#BreakPointViewer.__showBackMenu" />
--- a/Documentation/Source/eric6.Debugger.BreakPointViewer.html	Fri Dec 22 16:36:02 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.BreakPointViewer.html	Fri Dec 22 17:56:49 2017 +0100
@@ -126,12 +126,18 @@
 <td><a href="#BreakPointViewer.__layoutDisplay">__layoutDisplay</a></td>
 <td>Private slot to perform a layout operation.</td>
 </tr><tr>
+<td><a href="#BreakPointViewer.__loadRecent">__loadRecent</a></td>
+<td>Private method to load the recently used file names.</td>
+</tr><tr>
 <td><a href="#BreakPointViewer.__resizeColumns">__resizeColumns</a></td>
 <td>Private slot to resize the view when items get added, edited or deleted.</td>
 </tr><tr>
 <td><a href="#BreakPointViewer.__resort">__resort</a></td>
 <td>Private slot to resort the tree.</td>
 </tr><tr>
+<td><a href="#BreakPointViewer.__saveRecent">__saveRecent</a></td>
+<td>Private method to save the list of recently used file names.</td>
+</tr><tr>
 <td><a href="#BreakPointViewer.__setBpEnabled">__setBpEnabled</a></td>
 <td>Private method to set the enabled status of a breakpoint.</td>
 </tr><tr>
@@ -297,6 +303,11 @@
 <b>__layoutDisplay</b>(<i></i>)
 <p>
         Private slot to perform a layout operation.
+</p><a NAME="BreakPointViewer.__loadRecent" ID="BreakPointViewer.__loadRecent"></a>
+<h4>BreakPointViewer.__loadRecent</h4>
+<b>__loadRecent</b>(<i></i>)
+<p>
+        Private method to load the recently used file names.
 </p><a NAME="BreakPointViewer.__resizeColumns" ID="BreakPointViewer.__resizeColumns"></a>
 <h4>BreakPointViewer.__resizeColumns</h4>
 <b>__resizeColumns</b>(<i></i>)
@@ -308,6 +319,11 @@
 <b>__resort</b>(<i></i>)
 <p>
         Private slot to resort the tree.
+</p><a NAME="BreakPointViewer.__saveRecent" ID="BreakPointViewer.__saveRecent"></a>
+<h4>BreakPointViewer.__saveRecent</h4>
+<b>__saveRecent</b>(<i></i>)
+<p>
+        Private method to save the list of recently used file names.
 </p><a NAME="BreakPointViewer.__setBpEnabled" ID="BreakPointViewer.__setBpEnabled"></a>
 <h4>BreakPointViewer.__setBpEnabled</h4>
 <b>__setBpEnabled</b>(<i>index, enabled</i>)
--- a/Documentation/Source/eric6.Globals.__init__.html	Fri Dec 22 16:36:02 2017 +0100
+++ b/Documentation/Source/eric6.Globals.__init__.html	Fri Dec 22 17:56:49 2017 +0100
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>configDir</td></tr><tr><td>recentNameFiles</td></tr><tr><td>recentNameHexFiles</td></tr><tr><td>recentNameHosts</td></tr><tr><td>recentNameMultiProject</td></tr><tr><td>recentNameProject</td></tr><tr><td>settingsNameGlobal</td></tr><tr><td>settingsNameOrganization</td></tr><tr><td>settingsNameRecent</td></tr>
+<tr><td>configDir</td></tr><tr><td>recentNameBreakpointConditions</td></tr><tr><td>recentNameBreakpointFiles</td></tr><tr><td>recentNameFiles</td></tr><tr><td>recentNameHexFiles</td></tr><tr><td>recentNameHosts</td></tr><tr><td>recentNameMultiProject</td></tr><tr><td>recentNameProject</td></tr><tr><td>settingsNameGlobal</td></tr><tr><td>settingsNameOrganization</td></tr><tr><td>settingsNameRecent</td></tr>
 </table>
 <h3>Classes</h3>
 <table>
--- a/Globals/__init__.py	Fri Dec 22 16:36:02 2017 +0100
+++ b/Globals/__init__.py	Fri Dec 22 17:56:49 2017 +0100
@@ -31,6 +31,8 @@
 recentNameFiles = "Files"
 recentNameHexFiles = "HexFiles"
 recentNameHosts = "Hosts6"
+recentNameBreakpointFiles = "BreakPointFiles"
+recentNameBreakpointConditions = "BreakPointConditions"
 
 configDir = None
 
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Fri Dec 22 16:36:02 2017 +0100
+++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Fri Dec 22 17:56:49 2017 +0100
@@ -135,6 +135,8 @@
             Preferences.getDebugger("PathTranslationLocal"))
         self.debugThreeStateBreakPoint.setChecked(
             Preferences.getDebugger("ThreeStateBreakPoints"))
+        self.recentFilesSpinBox.setValue(
+            Preferences.getDebugger("RecentNumber"))
         self.dontShowClientExitCheckBox.setChecked(
             Preferences.getDebugger("SuppressClientExit"))
         self.exceptionBreakCheckBox.setChecked(
@@ -218,6 +220,9 @@
             "ThreeStateBreakPoints",
             self.debugThreeStateBreakPoint.isChecked())
         Preferences.setDebugger(
+            "RecentNumber",
+            self.recentFilesSpinBox.value())
+        Preferences.setDebugger(
             "SuppressClientExit",
             self.dontShowClientExitCheckBox.isChecked())
         Preferences.setDebugger(
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.ui	Fri Dec 22 16:36:02 2017 +0100
+++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.ui	Fri Dec 22 17:56:49 2017 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>643</width>
-    <height>1600</height>
+    <height>1776</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -533,6 +533,46 @@
         </property>
        </widget>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Number of recent files and conditions:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="recentFilesSpinBox">
+          <property name="toolTip">
+           <string>Enter the number of recent files and breakpoint conditions to remember</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="minimum">
+           <number>5</number>
+          </property>
+          <property name="maximum">
+           <number>50</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="spacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
@@ -683,6 +723,7 @@
   <tabstop>automaticResetCheckBox</tabstop>
   <tabstop>dontShowClientExitCheckBox</tabstop>
   <tabstop>debugThreeStateBreakPoint</tabstop>
+  <tabstop>recentFilesSpinBox</tabstop>
   <tabstop>exceptionBreakCheckBox</tabstop>
   <tabstop>exceptionShellCheckBox</tabstop>
   <tabstop>maxSizeSpinBox</tabstop>
--- a/Preferences/__init__.py	Fri Dec 22 16:36:02 2017 +0100
+++ b/Preferences/__init__.py	Fri Dec 22 17:56:49 2017 +0100
@@ -86,6 +86,9 @@
         "AutomaticReset": False,
         "Autosave": True,
         "ThreeStateBreakPoints": False,
+        "RecentNumber": 9,
+        # max. number of file names to be remembered for the add breakpoint
+        # dialog
         "SuppressClientExit": False,
         "BreakAlways": False,
         "ShowExceptionInShell": True,
@@ -1729,7 +1732,7 @@
                ]:
         return toBool(prefClass.settings.value(
             "Debugger/" + key, prefClass.debuggerDefaults[key]))
-    elif key in ["PassiveDbgPort", "MaxVariableSize"]:
+    elif key in ["PassiveDbgPort", "MaxVariableSize", "RecentNumber"]:
         return int(
             prefClass.settings.value(
                 "Debugger/" + key, prefClass.debuggerDefaults[key]))
--- a/changelog	Fri Dec 22 16:36:02 2017 +0100
+++ b/changelog	Fri Dec 22 17:56:49 2017 +0100
@@ -2,6 +2,9 @@
 ----------
 Version 18.01:
 - bug fixes
+- Debugger / Breakpoint Viewer
+  -- added the capability to remember the most recently used file names and
+     conditions
 - Editor
   -- added an action to the view menu to clear all folds of the current editor
 - Project
--- a/i18n/eric6_cs.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_cs.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2220,72 +2220,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>Breakpointy</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>Editovat...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>Zapnout</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>Zapnout vše</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>Vypnout</translation>
+        <source>Edit...</source>
+        <translation>Editovat...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>Zapnout</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>Vypnout vše</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>Smazat</translation>
+        <source>Enable all</source>
+        <translation>Zapnout vše</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>Vypnout</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>Vypnout vše</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>Smazat</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>Smazat vše</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>Jít na</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>Zapnout vybrané</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>Vypnout vybrané</translation>
+        <source>Enable selected</source>
+        <translation>Zapnout vybrané</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="196"/>
-        <source>Delete selected</source>
-        <translation>Smazat vybrané</translation>
+        <source>Disable selected</source>
+        <translation>Vypnout vybrané</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
+        <source>Delete selected</source>
+        <translation>Smazat vybrané</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
         <source>Configure...</source>
         <translation>Konfigurovat...</translation>
     </message>
@@ -6691,17 +6691,17 @@
         <translation>Automatické ukládání změn ve skriptech</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>Přidat povoleného hosta</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>Zadání IP adresy povoleného hosta</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>Editovat povolené hosty</translation>
     </message>
@@ -6761,75 +6761,85 @@
         <translation>Breakpointy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation>Výjimky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation>Vybrat vždy zastavit na výjimkách</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation>Vždy zastavit na výjimkách</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zadaná adresa &lt;b&gt;{0}&lt;/b&gt; není validní IP v4 nebo IP v6. Zrušeno...&lt;/p&gt;</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished">Počet nedávných souborů:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -10029,22 +10039,22 @@
         <translation>Editovat breakpointy</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
         <source>Select, whether the breakpoint is enabled</source>
         <translation>Vybrat, má-li být breakpoint aktivovaný</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>Zapnuto</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
-        <source>Select whether this is a temporary breakpoint</source>
-        <translation>Vybrat, má-li být breakpoint dočasný</translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <source>Select whether this is a temporary breakpoint</source>
+        <translation>Vybrat, má-li být breakpoint dočasný</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation>Dočasný breakpoint</translation>
     </message>
@@ -10059,7 +10069,7 @@
         <translation>Zadání nebo výběr podmínky breakpointu</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation>Zadání počtu průchodů, které má breakpoint ignorovat</translation>
     </message>
@@ -10089,12 +10099,12 @@
         <translation>Podmínka:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation>Ignorovat počet:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation>Přidat breakpoint</translation>
     </message>
@@ -10440,7 +10450,7 @@
         <translation>Editovat breakpoint...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation>Aktivovat breakpoint</translation>
     </message>
@@ -10540,187 +10550,187 @@
         <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation>Deaktivovat breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation>Pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation>Prosím, vyberte soubor s pokrytím kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zobrazit poznámky pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation>Všechny řádky byly pokryty.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation>Soubor s pokrytím není dostupný.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation>Profilovat data</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation>Prosím, vyberte soubor s profilem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation>Chyba syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation>Hlášení syntaktické chyby není dostupné.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation>Název makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation>Vyberte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation>Načíst soubor makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation>Macro soubory (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation>Chyba při načítání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation>Uložit soubor s makrem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation>Uložit makro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation>Chyba při ukládání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation>Spustit záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Nahrávání makra již probíhá. Spustit nové?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation>Záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation>Vložte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation>Soubor změněn</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation>Zdroje</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation>Přidat soubor...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation>Přidat soubory...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation>Přidat zástupce souboru...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation>Přidat lokalizované resource...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation>Přidat soubor...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation>Přidat soubory...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation>Přidat zástupce souboru...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation>Přidat lokalizované resource...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation>Přidat resource frame</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resource</source>
         <translation>Přidat soubor resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
         <source>Add file resources</source>
         <translation>Přidat soubory resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Add aliased file resource</source>
         <translation>Přidat zástupce souboru resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Package Diagram</source>
         <translation>Diagram balíčku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Include class attributes?</source>
         <translation>Včetně atributů třídy?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Application Diagram</source>
         <translation>Diagram aplikace</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Include module names?</source>
         <translation>Včetně jmen modulů?</translation>
     </message>
@@ -10740,12 +10750,12 @@
         <translation>Nebyl zadán forám exportu. Zrušeno....</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation>Importovat diagram</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation>Zahrnout importy z externích modulů?</translation>
     </message>
@@ -10820,7 +10830,7 @@
         <translation>Použít Pygments lexer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation>Zatrhnout kontrolu...</translation>
     </message>
@@ -10830,12 +10840,12 @@
         <translation>Zatrhnout výběr kontroly...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation>Přidat do slovníku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation>Ignorovat vše</translation>
     </message>
@@ -10875,32 +10885,32 @@
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; je poškozen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;So souboru s makrem &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Zástupce pro soubor &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
@@ -10930,22 +10940,22 @@
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10970,27 +10980,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation type="unfinished">Varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11015,7 +11025,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; byl změněn po té co již byl načten do eric5. Znovu načíst?&lt;/p&gt; {0}?} {6.?}</translation>
     </message>
@@ -11030,32 +11040,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50202,27 +50212,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_de.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2151,72 +2151,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>Haltepunkte</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>Bearbeiten …</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>Aktivieren</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>Alle aktivieren</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>Deaktivieren</translation>
+        <source>Edit...</source>
+        <translation>Bearbeiten …</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>Aktivieren</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>Alle deaktivieren</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>Löschen</translation>
+        <source>Enable all</source>
+        <translation>Alle aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>Deaktivieren</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>Alle deaktivieren</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>Alle löschen</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>Gehe zu</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>Ausgewählte aktivieren</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>Ausgewählte deaktivieren</translation>
+        <source>Enable selected</source>
+        <translation>Ausgewählte aktivieren</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="196"/>
-        <source>Delete selected</source>
-        <translation>Ausgewählte löschen</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
-        <source>Add</source>
-        <translation>Hinzufügen</translation>
+        <source>Disable selected</source>
+        <translation>Ausgewählte deaktivieren</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
+        <source>Delete selected</source>
+        <translation>Ausgewählte löschen</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
+        <source>Add</source>
+        <translation>Hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
         <source>Configure...</source>
         <translation>Einstellungen …</translation>
     </message>
@@ -6565,22 +6565,22 @@
         <translation>Geänderte Skripte automatisch sichern</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>Zugelassene Rechner hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>Gib die IP-Adresse eines zugelassenen Rechners ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die eingegebene Adresse &lt;b&gt;{0}&lt;/b&gt; ist keine gültige IPv4- oder IPv6-Adresse. Abbruch …&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>Zugelassene Rechner bearbeiten</translation>
     </message>
@@ -6612,7 +6612,7 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="532"/>
         <source>Three state breakpoint</source>
-        <translation>Breakpoint mit drei Zuständen</translation>
+        <translation>Haltepunkt mit drei Zuständen</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="475"/>
@@ -6640,70 +6640,80 @@
         <translation>Haltepunkte</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation>Ausnahmen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation>Auswählen, um bei Ausnahmen immer anzuhalten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation>Bei Ausnahmen immer anhalten</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation>Betrachter für lokale Variablen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation>Quelltext automatisch anzeigen, wenn der Nutzer einen anderen Rahmen im Aufrufstapelbetrachter auswählt.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation>Quelltext automatisch anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation>Auswählen, um Ausnahmeninformationen im Shell Fenster anzuzeigen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation>Ausnahmen im Shell Fenster anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation>Max. Variablengröße:</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
-        <translation>Betrachter für lokale Variablen</translation>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
+        <translation>Gib die maximale Variablengröße ein, bis zu der sie angeteigt wird (0 = unbegrenzt)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation>Quelltext automatisch anzeigen, wenn der Nutzer einen anderen Rahmen im Aufrufstapelbetrachter auswählt.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation>Quelltext automatisch anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation>Auswählen, um Ausnahmeninformationen im Shell Fenster anzuzeigen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation>Ausnahmen im Shell Fenster anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation>Max. Variablengröße:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation>Gib die maximale Variablengröße ein, bis zu der sie angeteigt wird (0 = unbegrenzt)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation>keine Begrenzung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation> Bytes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation>Variablenbetrachter</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation>Anzahl zuletzt geöffneter Dateien und Bedingungen:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation>Gib die zu merkende Anzahl an zuletzt verwendeter Dateien und Haltepunktbedingungen ein</translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -9684,7 +9694,7 @@
         <translation>Haltepunkt bearbeiten</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation># Ignorierungen:</translation>
     </message>
@@ -9709,7 +9719,7 @@
         <translation>Gib die Zeilennummer des Haltepunktes ein</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation>Gebe ein, wie oft der Haltepunkt übersprungen werden soll</translation>
     </message>
@@ -9724,27 +9734,27 @@
         <translation>Gib den Dateinamen des Haltepunktes ein</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
         <source>Select whether this is a temporary breakpoint</source>
         <translation>Wähle, ob dies ein temporärer Haltepunkt ist</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation>Temporärer Haltepunkt</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
-        <source>Select, whether the breakpoint is enabled</source>
-        <translation>Wähle, ob dieser Haltepunkt aktiv ist</translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <source>Select, whether the breakpoint is enabled</source>
+        <translation>Wähle, ob dieser Haltepunkt aktiv ist</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation>Haltepunkt hinzufügen</translation>
     </message>
@@ -9935,7 +9945,7 @@
         <translation>Drucken abgebrochen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation>Datei geändert</translation>
     </message>
@@ -10000,57 +10010,57 @@
         <translation>Zurück zum letzten gesichert Zustand</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation>Makro Name</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation>Wähle einen Makro Namen:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation>Makrodateien (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation>Lade Makrodatei</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation>Fehler beim Makro Laden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation>Makrodatei schreiben</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation>Makro speichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation>Fehler beim Makro speichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation>Makroaufzeichnung starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation>Makroaufzeichnung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation>Gib einen Namen für das Makro ein:</translation>
     </message>
@@ -10110,32 +10120,32 @@
         <translation>Haltepunkt bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation>Haltepunkt aktivieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation>Haltepunkt deaktivieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation>Quelltext Abdeckung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation>Profildaten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation>Bitte wählen Sie eine Datei mit Profildaten</translation>
     </message>
@@ -10175,7 +10185,7 @@
         <translation>Autom. Speicherung aktiv</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation>Drop Fehler</translation>
     </message>
@@ -10185,12 +10195,12 @@
         <translation>Zeige Syntaxfehlermeldung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation>Syntaxfehler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
     </message>
@@ -10220,17 +10230,17 @@
         <translation>Vorige nichtabgedeckte Zeile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zeilen ohne Abdeckung Markieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation>Alle Zeilen sind abgedeckt.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation>
     </message>
@@ -10240,22 +10250,22 @@
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; enthält ungesicherte Änderungen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; ist zerstört.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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>
@@ -10295,82 +10305,82 @@
         <translation>Keine Sprache</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation>Ressourcen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation>Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation>Dateien hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation>Aliased-Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation>Lokalisierte Ressource hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
-        <source>Add file resource</source>
-        <translation>Dateiressource hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
-        <source>Add file resources</source>
-        <translation>Dateiressourcen hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
-        <source>Add aliased file resource</source>
-        <translation>Aliased-Dateiressourcen hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
-        <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
-        <translation>Alias für Datei &lt;b&gt;{0}&lt;/b&gt;:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
-        <source>Package Diagram</source>
-        <translation>Package-Diagramm</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
-        <source>Include class attributes?</source>
-        <translation>Klassenattribute anzeigen?</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
-        <source>Application Diagram</source>
-        <translation>Applikations-Diagramm</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
-        <source>Include module names?</source>
-        <translation>Modulnamen anzeigen?</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation>Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation>Dateien hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation>Aliased-Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation>Lokalisierte Ressource hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
+        <source>Add file resource</source>
+        <translation>Dateiressource hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
+        <source>Add file resources</source>
+        <translation>Dateiressourcen hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
+        <source>Add aliased file resource</source>
+        <translation>Aliased-Dateiressourcen hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
+        <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
+        <translation>Alias für Datei &lt;b&gt;{0}&lt;/b&gt;:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
+        <source>Package Diagram</source>
+        <translation>Package-Diagramm</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
+        <source>Include class attributes?</source>
+        <translation>Klassenattribute anzeigen?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
+        <source>Application Diagram</source>
+        <translation>Applikations-Diagramm</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
+        <source>Include module names?</source>
+        <translation>Modulnamen anzeigen?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation>Ressourcenrahmen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation>
     </message>
@@ -10420,12 +10430,12 @@
         <translation>Kein Exportformat angegeben. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation>Imports Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation>Imports externer Module anzeigen?</translation>
     </message>
@@ -10500,7 +10510,7 @@
         <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation>Rechtschreibprüfung...</translation>
     </message>
@@ -10510,12 +10520,12 @@
         <translation>Rechtschreibprüfung für Auswahl...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation>Zum Wörterbuch hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation>Alle ignorieren</translation>
     </message>
@@ -10560,22 +10570,22 @@
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation>Warnung: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation>Fehler: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Warnung:&lt;/b&gt; Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation>
     </message>
@@ -10600,27 +10610,27 @@
         <translation>Vorherige Änderung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation>Zeilen sortieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation>Keine Warnmeldungen verfügbar.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation>Stil: {0}</translation>
     </message>
@@ -10645,7 +10655,7 @@
         <translation>Öffnen mit Kodierung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?&lt;/p&gt;</translation>
     </message>
@@ -10660,32 +10670,32 @@
         <translation>Vervollständigen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation>Provider für automatische Vervollständigungen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Provider für automatische Vervollständigungen namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation>Calltipps-Provider</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Calltipps-Provider namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation>Maus Klick Handler registrieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Ein Maus Klick Handler für &quot;{0}&quot; wurde bereits durch &quot;{1}&quot; registriert. Die Anfrage durch &quot;{2}&quot; wird abgebrochen...</translation>
     </message>
@@ -49251,27 +49261,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
--- a/i18n/eric6_empty.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_empty.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2129,72 +2129,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
+        <source>Enable all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
+        <source>Configure...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
+        <source>Enable selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
+        <source>Disable selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
-        <source>Configure...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
         <source>Delete selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6548,90 +6548,100 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
         <source>Select to show exception information in the shell window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
         <source>Show exceptions in Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
+        <source>Add allowed host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
+        <source>Enter the IP address of an allowed host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
+        <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
+        <source>Edit allowed host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
-        <source>Add allowed host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
-        <source>Enter the IP address of an allowed host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
-        <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
-        <source>Edit allowed host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -9605,37 +9615,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
-        <source>Select whether this is a temporary breakpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <source>Select whether this is a temporary breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
-        <source>Select, whether the breakpoint is enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <source>Select, whether the breakpoint is enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9806,7 +9816,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10076,7 +10086,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10271,317 +10281,317 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49003,27 +49013,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_en.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2129,72 +2129,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
+        <source>Enable all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
+        <source>Configure...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
+        <source>Enable selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
+        <source>Disable selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
-        <source>Configure...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
         <source>Delete selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6555,90 +6555,100 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -9589,22 +9599,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
         <source>Select, whether the breakpoint is enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
-        <source>Select whether this is a temporary breakpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <source>Select whether this is a temporary breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9619,7 +9629,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9644,12 +9654,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9820,7 +9830,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10045,7 +10055,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10230,257 +10240,257 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10505,27 +10515,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10550,7 +10560,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10565,32 +10575,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49047,27 +49057,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_es.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2148,72 +2148,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>Breakpoints</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>Editar...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>Habilitar</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>Habilitar todo</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>Deshabilitar</translation>
+        <source>Edit...</source>
+        <translation>Editar...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>Habilitar</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>Deshabilitar todo</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>Borrar</translation>
+        <source>Enable all</source>
+        <translation>Habilitar todo</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>Deshabilitar</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>Deshabilitar todo</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>Borrar todo</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>Ir a</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>Habilitar selección</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>Deshabilitar selección</translation>
+        <source>Enable selected</source>
+        <translation>Habilitar selección</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="196"/>
-        <source>Delete selected</source>
-        <translation>Borrar selección</translation>
+        <source>Disable selected</source>
+        <translation>Deshabilitar selección</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
+        <source>Delete selected</source>
+        <translation>Borrar selección</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
         <source>Configure...</source>
         <translation>Configurar...</translation>
     </message>
@@ -6561,17 +6561,17 @@
         <translation>Autoguardar scripts con cambios</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>Añadir host permitido</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>Introduzca la dirección IP de un host permitido</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>Editar host permitido</translation>
     </message>
@@ -6631,75 +6631,85 @@
         <translation>Puntos de interrupción (Breakpoints)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation>Excepciones</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation>Seleccionar para detenerse siempre en las excepciones</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation>Detenerse siempre en las excepciones</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;La dirección introducida &lt;b&gt;{0}&lt;/b&gt; no es una dirección IP v4 o IP v6 válida. Abortando...&lt;/p&gt;</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation>Visor de Variables Locales</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation>Automaticamente ver código fuente cuando el usuario cambia el marco de pila de llamadas en el visor de pila de llamadas.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation>Automaticamente ver código fuente</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation>Seleccionar para mostrar información de excepciones en la ventana de shell</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation>Mostrar excepciones en Shell</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation>Tamaño Máx. de Variable:</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
-        <translation>Visor de Variables Locales</translation>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
+        <translation>Introducir el tamaño máximo de variable a mostrar (0 = sin límite)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation>Automaticamente ver código fuente cuando el usuario cambia el marco de pila de llamadas en el visor de pila de llamadas.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation>Automaticamente ver código fuente</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation>Seleccionar para mostrar información de excepciones en la ventana de shell</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation>Mostrar excepciones en Shell</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation>Tamaño Máx. de Variable:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation>Introducir el tamaño máximo de variable a mostrar (0 = sin límite)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation>sin límite</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation> Bytes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation>Visor de Variables</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished">Número de archivos recientes:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -9678,22 +9688,22 @@
         <translation>Editar punto de interrupción</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
         <source>Select, whether the breakpoint is enabled</source>
         <translation>Seleccionar si el punto de interrupción esta habilitado</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>Habilitado</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
-        <source>Select whether this is a temporary breakpoint</source>
-        <translation>Seleccione si este es un punto de interrupción temporal</translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <source>Select whether this is a temporary breakpoint</source>
+        <translation>Seleccione si este es un punto de interrupción temporal</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation>Punto de Interrupción Temporal</translation>
     </message>
@@ -9708,7 +9718,7 @@
         <translation>Introduzca o seleccione una condición para el punto de interrupción</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation>Introduzca un conteo de ignoración para el punto de interrupción</translation>
     </message>
@@ -9733,12 +9743,12 @@
         <translation>Condición:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation>Conteo de ignoración:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation>Añadir Punto de Interrupción</translation>
     </message>
@@ -10074,7 +10084,7 @@
         <translation>Editar punto de interrupción...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation>Activar punto de interrupción</translation>
     </message>
@@ -10184,197 +10194,197 @@
         <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation>Deshabilitar punto de interrupción</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation>Cobertura de codigo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation>Por favor seleccione un archivo de cobertura</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Mostrar Anotaciones de Cobertura de Código</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation>Todas las líneas han sido cubiertas.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation>No hay archivo de cobertura disponible.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation>Datos de profiling</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation>Por favor seleccione un archivo de profiling</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation>Error de sintaxis</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation>No hay mensajes de error de sintaxis disponibles.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation>Nombre de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation>Seleccione un nombre de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation>Cargar archivo de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation>Archivos de Macro  (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation>Error al cargar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation>Guardar archivo de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation>Guardar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation>Error al guardar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation>Comenzar grabación de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation>Grabando macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation>Introduzca el nombre de la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation>Archivo modificado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation>Error al soltar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation>Recursos</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation>Añadir archivo...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation>Añadir archivos...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation>Añadir archivo con un alias...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation>Añadir recursos localizados...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation>Añadir archivo...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation>Añadir archivos...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation>Añadir archivo con un alias...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation>Añadir recursos localizados...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation>Añadir ventana de recursos</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resource</source>
         <translation>Añadir archivo de recursos</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
         <source>Add file resources</source>
         <translation>Añadir archivo de recursos</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Add aliased file resource</source>
         <translation>Añadir archivo de recursos con un alias</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Package Diagram</source>
         <translation>Digrama de paquetes</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Include class attributes?</source>
         <translation>¿Incluir atributos de clase?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation>Diagrama de imports</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation>¿Incluir los imports de módulos externos?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Application Diagram</source>
         <translation>Diagrama de aplicación</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Include module names?</source>
         <translation>¿Incluir nombres de módulos?</translation>
     </message>
@@ -10444,7 +10454,7 @@
         <translation>Seleccionar el Analizador Léxico de Pygments.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation>Corrección ortográfica...</translation>
     </message>
@@ -10454,12 +10464,12 @@
         <translation>Corrección ortográfica de la selección...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation>Añadir al diccionario</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation>Ignorar Todo</translation>
     </message>
@@ -10499,32 +10509,32 @@
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; no se puede leer.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; está dañado&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de macro  &lt;b&gt;{0}&lt;/b&gt; no se puede escribir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Alias para el archivo &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
@@ -10554,22 +10564,22 @@
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation>Advertencia: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation>Error: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Advertencia:&lt;/b&gt; Perderá los cambios si lo reabre.</translation>
     </message>
@@ -10594,27 +10604,27 @@
         <translation>Cambio anterior</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation>Ordenar Líneas</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>La selección contiene datos ilegales para una ordenación numérica.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation>No hay mensajes de advertencia disponibles.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation>Estilo: {0}</translation>
     </message>
@@ -10639,7 +10649,7 @@
         <translation>Reabrir Con Codificación</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?&lt;/p&gt;</translation>
     </message>
@@ -10654,32 +10664,32 @@
         <translation>Completo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation>Proveedor de Autocompletado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>El proveedor de lista de completado&apos;{0}&apos; ya está registrado. Se ignora la solicitud duplicada.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation>Proveedor de Call-Tips</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>El proveedor de call-tips&apos;{0}&apos; ya está registrado. Se ignora la solicitud duplicada.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation>Registrar Manejador de Clicks de Ratón</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Un manejador de clicks de ratón para &quot;{0}&quot; ya está registrado por &quot;{1}&quot;. Abortando solicitud por &quot;{2}&quot;...</translation>
     </message>
@@ -49252,27 +49262,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
--- a/i18n/eric6_fr.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_fr.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2242,72 +2242,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>Point d&apos;arrêts</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>Éditer...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>Activer</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>Tout activer</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>Désactiver</translation>
+        <source>Edit...</source>
+        <translation>Éditer...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>Activer</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>Tout désactiver</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>Supprimer</translation>
+        <source>Enable all</source>
+        <translation>Tout activer</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>Désactiver</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>Tout désactiver</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>Tout supprimer</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>Aller à</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>Activer la sélection</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>Désactiver la sélection</translation>
+        <source>Enable selected</source>
+        <translation>Activer la sélection</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="196"/>
-        <source>Delete selected</source>
-        <translation>Supprimer la sélection</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
-        <source>Add</source>
-        <translation>Ajouter</translation>
+        <source>Disable selected</source>
+        <translation>Désactiver la sélection</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
+        <source>Delete selected</source>
+        <translation>Supprimer la sélection</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
+        <source>Add</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
         <source>Configure...</source>
         <translation>Configuration...</translation>
     </message>
@@ -6695,17 +6695,17 @@
         <translation>Sauvegarde automatique des scripts modifiés</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>Ajouter un hôte autorisé</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>Entrer l&apos;adresse IP d&apos;un hôte autorisé</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>Éditer un hôte autorisé</translation>
     </message>
@@ -6765,75 +6765,85 @@
         <translation type="unfinished">Point d&apos;arrêts</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation type="unfinished">Exceptions</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished">Nombre de fichiers récents:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -9980,7 +9990,7 @@
         <translation>Édition point d&apos;arrêt</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation>Nombre de passages ignorés:</translation>
     </message>
@@ -10010,7 +10020,7 @@
         <translation>Entrer le numéro de ligne du point d&apos;arret</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation>Entrer le nombre de passages où le point d&apos;arrêt doit être ingnoré</translation>
     </message>
@@ -10025,27 +10035,27 @@
         <translation>Entrer le nom de fichier pour le point d&apos;arrêt</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
         <source>Select whether this is a temporary breakpoint</source>
         <translation>Cocher s&apos;il s&apos;agit d&apos;un point d&apos;arrêt temporaire</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation>Point d&apos;arrêt temporaire</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
-        <source>Select, whether the breakpoint is enabled</source>
-        <translation>Cocher si le point d&apos;arrêt est activé</translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <source>Select, whether the breakpoint is enabled</source>
+        <translation>Cocher si le point d&apos;arrêt est activé</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>Activé</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation>Ajouter un point d&apos;arrêt</translation>
     </message>
@@ -10296,7 +10306,7 @@
         <translation>Éditer le point d&apos;arrêt...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation>Activer le point d&apos;arrêt</translation>
     </message>
@@ -10381,87 +10391,87 @@
         <translation>L&apos;autocompletion n&apos;est pas disponible car aucune source d&apos;autocomplétion n&apos;est définie.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation>Désactiver le point d&apos;arrêt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation>Code Coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation>Sélectionner un fichier coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation>Profiler de données</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation>Sélectionner un fichier profile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation>Nom de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation>Sélectionner un nom de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation>Fichier Macro (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation>Charger un fichier macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation>Erreur lors du chargement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation>Enregistrer le fichier macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation>Enregistrer la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation>Erreur lors de l&apos;enregistrement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation>Démarrer l&apos;enregistrement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation>Enregistrement de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation>Entrer le nom de la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation>Fichier modifié</translation>
     </message>
@@ -10481,7 +10491,7 @@
         <translation>Supprimer les flags d&apos;erreurs de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation>Erreur de suppression</translation>
     </message>
@@ -10491,12 +10501,12 @@
         <translation>Afficher le message d&apos;erreur de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation>Erreur de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation>Aucun message d&apos;erreur de syntaxe..</translation>
     </message>
@@ -10526,17 +10536,17 @@
         <translation>Ligne non executée précédente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Afficher les annotations de Code Coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation>Toutes les lignes ont été executées.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation>Impossible de trouver le fichier de coverage.</translation>
     </message>
@@ -10571,72 +10581,72 @@
         <translation>Pas de langage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation>Ressources</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation>Ajouter un fichier...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation>Ajouter des fichiers...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation>Ajouter un fichier alias...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation>Ajouter une ressource localisée...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
-        <source>Add file resource</source>
-        <translation>Ajoute un fichier ressource</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
-        <source>Add file resources</source>
-        <translation>Ajoute des fichiers ressources</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
-        <source>Add aliased file resource</source>
-        <translation>Ajoute un alias de fichier ressource</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
-        <source>Package Diagram</source>
-        <translation>Diagramme de package</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
-        <source>Include class attributes?</source>
-        <translation>Inclure les attributs de classes ?</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
-        <source>Application Diagram</source>
-        <translation>Diagramme de l&apos;application</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
-        <source>Include module names?</source>
-        <translation>Inclure les noms de modules ?</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation>Ajouter un fichier...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation>Ajouter des fichiers...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation>Ajouter un fichier alias...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation>Ajouter une ressource localisée...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
+        <source>Add file resource</source>
+        <translation>Ajoute un fichier ressource</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
+        <source>Add file resources</source>
+        <translation>Ajoute des fichiers ressources</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
+        <source>Add aliased file resource</source>
+        <translation>Ajoute un alias de fichier ressource</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
+        <source>Package Diagram</source>
+        <translation>Diagramme de package</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
+        <source>Include class attributes?</source>
+        <translation>Inclure les attributs de classes ?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
+        <source>Application Diagram</source>
+        <translation>Diagramme de l&apos;application</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
+        <source>Include module names?</source>
+        <translation>Inclure les noms de modules ?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation>Ajouter un cadre ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>L&apos;enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation>
     </message>
@@ -10686,12 +10696,12 @@
         <translation>Aucun format d&apos;exportation indiqué. Abandon...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation>Diagramme des modules</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation>Inclure l&apos;importation de modules externes?</translation>
     </message>
@@ -10766,7 +10776,7 @@
         <translation>Sélectionne l&apos;analyseur Pygments à appliquer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation>Correction orthographique...</translation>
     </message>
@@ -10776,12 +10786,12 @@
         <translation>Correction orthographique de la sélection...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation>Ajouter au dictionnaire</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation>Tout ignorer</translation>
     </message>
@@ -10821,32 +10831,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10876,22 +10886,22 @@
         <translation type="unfinished">&lt;p&gt;Le fichier &lt;b&gt;{0}&lt;/b&gt;existe déjà. Écraser ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10916,27 +10926,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation type="unfinished">Warning</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10961,7 +10971,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10976,32 +10986,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49943,27 +49953,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_it.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2146,72 +2146,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>Punti d&apos;interruzione</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>Modifica...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>Abilita</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>Abilita tutti</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>Disabilita</translation>
+        <source>Edit...</source>
+        <translation>Modifica...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>Abilita</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>Disabilita tutti</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>Cancella</translation>
+        <source>Enable all</source>
+        <translation>Abilita tutti</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>Disabilita</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>Disabilita tutti</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>Cancella</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>Cancella tutto</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>Vai a</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>Abilita selezionato</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>Disabilita selezionato</translation>
+        <source>Enable selected</source>
+        <translation>Abilita selezionato</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="196"/>
-        <source>Delete selected</source>
-        <translation>Cancella selezionato</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
-        <source>Add</source>
-        <translation>Aggiungi</translation>
+        <source>Disable selected</source>
+        <translation>Disabilita selezionato</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
+        <source>Delete selected</source>
+        <translation>Cancella selezionato</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
         <source>Configure...</source>
         <translation>Configura...</translation>
     </message>
@@ -6543,17 +6543,17 @@
         <translation>Salvataggio automatico degli script</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>Aggiungi un host consentito</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>Inserisci l&apos;indirizzo IP di un host consentito</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>Modifica host permessi</translation>
     </message>
@@ -6613,75 +6613,85 @@
         <translation>Breakpoints</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation>Eccezioni</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation>Seleziona per fermare sempre in caso di eccezione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation>Ferma sempre in caso di eccezione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;L&apos;indirizzo &lt;b&gt;{0}&lt;/b&gt; non è un indirizzo IP v4 o v6 valido. Uscita...&lt;/p&gt;</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation>Vista delle variabili locali</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation>Vista automatica del codice sorgente quando l&apos;utente modifica il blocco della pila di chiamate nella vista della pila di chiamate.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation>Vista codice sorgente in automatico</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
-        <translation>Vista delle variabili locali</translation>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation>Vista automatica del codice sorgente quando l&apos;utente modifica il blocco della pila di chiamate nella vista della pila di chiamate.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation>Vista codice sorgente in automatico</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished">Numero di file recenti:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -9656,7 +9666,7 @@
         <translation>Modifica breakpoint</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation>Ignora per:</translation>
     </message>
@@ -9681,7 +9691,7 @@
         <translation>Inserisci il numero di riga del breakpoint</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation>Inserisci quante volte devo ignorare il breakpoint</translation>
     </message>
@@ -9696,27 +9706,27 @@
         <translation>Inserisci il nome del file del breakpoint</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
         <source>Select whether this is a temporary breakpoint</source>
         <translation>Seleziona se questo è un breakpoint temporaneo</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation>Breakpoint temporaneo</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
-        <source>Select, whether the breakpoint is enabled</source>
-        <translation>Seleziona, se il breakpoint è abilitato</translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <source>Select, whether the breakpoint is enabled</source>
+        <translation>Seleziona, se il breakpoint è abilitato</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation>Aggiungi un breakpoint</translation>
     </message>
@@ -9962,7 +9972,7 @@
         <translation>Modifica Breakpoint...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation>Abilita breakpoint</translation>
     </message>
@@ -10047,87 +10057,87 @@
         <translation>L&apos;autocomplentamento non è disponibile perchè non ci sono fonti impostate.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation>Disabilita breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation>Analisi codice</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation>Per favore seleziona un file per l&apos;analisi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation>Profilazione dati</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation>Per favore seleziona un file per la profilazione</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation>Nome Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation>Seleziona un nome per la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation>File Macro (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation>Carica un file di macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation>Errore nel caricamento della macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation>Salva un file di macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation>Salva macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation>Errore nel salvataggio della macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation>Avvia registrazione della macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation>Registrazione Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation>Inserisci un nome per la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation>File modificato</translation>
     </message>
@@ -10147,7 +10157,7 @@
         <translation>Elimina errori di sintassi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation>Errore Drop</translation>
     </message>
@@ -10157,12 +10167,12 @@
         <translation>Mostra i messaggi degli errori di sintassi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation>Errore di sintassi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation>Nessun messaggio degli errori di sintassi disponibile.</translation>
     </message>
@@ -10192,17 +10202,17 @@
         <translation>File non analizzato precedente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Mostra le annotazioni dell&apos;analisi del codice</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation>Tutte le linee sono state analizzate.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation>Non ci sono file di analisi disponibili.</translation>
     </message>
@@ -10237,72 +10247,72 @@
         <translation>Nessun linguaggio</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation>Risorse</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation>Aggiungi file...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation>Aggiungi files...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation>Aggiungi file sinonimo...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation>Aggiungi una risorsa localizzata...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
-        <source>Add file resource</source>
-        <translation>Aggiungi un file risorse</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
-        <source>Add file resources</source>
-        <translation>Aggiundi dei file risorse</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
-        <source>Add aliased file resource</source>
-        <translation>Aggiungi file sinonimo delle risorse</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
-        <source>Package Diagram</source>
-        <translation>Diagrammi del package</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
-        <source>Include class attributes?</source>
-        <translation>Includi gli attributi della classe ?</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
-        <source>Application Diagram</source>
-        <translation>Diagrammi dell&apos;applicazione</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
-        <source>Include module names?</source>
-        <translation>Includi i nomi dei moduli ?</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation>Aggiungi file...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation>Aggiungi files...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation>Aggiungi file sinonimo...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation>Aggiungi una risorsa localizzata...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
+        <source>Add file resource</source>
+        <translation>Aggiungi un file risorse</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
+        <source>Add file resources</source>
+        <translation>Aggiundi dei file risorse</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
+        <source>Add aliased file resource</source>
+        <translation>Aggiungi file sinonimo delle risorse</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
+        <source>Package Diagram</source>
+        <translation>Diagrammi del package</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
+        <source>Include class attributes?</source>
+        <translation>Includi gli attributi della classe ?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
+        <source>Application Diagram</source>
+        <translation>Diagrammi dell&apos;applicazione</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
+        <source>Include module names?</source>
+        <translation>Includi i nomi dei moduli ?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation>Aggiungi riquadro delle risorse</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation>
     </message>
@@ -10347,12 +10357,12 @@
         <translation>Nessun formato di export impostato. Annullamento...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation>Importa diagrammi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation>Includi gli import dai moduli esterni ?</translation>
     </message>
@@ -10422,7 +10432,7 @@
         <translation>Selezione l&apos;analizzatore lessicale di Pygments da applicare.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation>Controllo sillabazione...</translation>
     </message>
@@ -10432,12 +10442,12 @@
         <translation>Controllo sillabazione della selezione...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation>Aggiungi al dizionario</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation>Ignora tutto</translation>
     </message>
@@ -10477,32 +10487,32 @@
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere salvato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file macro &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file macro &lt;b&gt;{0}&lt;/b&gt; è danneggiato.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file macro &lt;b&gt;{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Alias per il file &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
@@ -10532,22 +10542,22 @@
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; esiste già. Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file  delle macro &lt;b&gt;{0}&lt;/b&gt; esiste già.Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation>Attenzione: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation>Errore: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Attenzione:&lt;/b&gt; con la riapertura le modifiche andranno perse.</translation>
     </message>
@@ -10572,27 +10582,27 @@
         <translation>Modifica precedente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation>Righe ordinate</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>La selezione contiene dati non validi per un ordinamento numerico.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation>Nessun messaggio di attenzione disponibile.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation>Stile: {0}</translation>
     </message>
@@ -10617,7 +10627,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; è stato modificato mentre era aperto in eric6. Rileggerlo ?&lt;/p&gt;</translation>
     </message>
@@ -10632,32 +10642,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49175,27 +49185,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_pt.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_pt.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2251,72 +2251,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>Pontos de Interrupção</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>Editar...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>Habilitar</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>Habilitar tudo</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>Inabilitar</translation>
+        <source>Edit...</source>
+        <translation>Editar...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>Habilitar</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>Inabilitar tudo</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>Apagar</translation>
+        <source>Enable all</source>
+        <translation>Habilitar tudo</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>Inabilitar</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>Inabilitar tudo</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>Apagar tudo</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>Ir a</translation>
     </message>
     <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
+        <source>Configure...</source>
+        <translation>Configurar...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
+        <source>Enable selected</source>
+        <translation>Habilitar seleção</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
+        <source>Disable selected</source>
+        <translation>Inabilitar seleção</translation>
+    </message>
+    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
-        <source>Configure...</source>
-        <translation>Configurar...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>Habilitar seleção</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>Inabilitar seleção</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
         <source>Delete selected</source>
         <translation>Apagar seleção</translation>
     </message>
@@ -6830,90 +6830,100 @@
         <translation>Ponto de interrupção de três estados</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation>Exceções</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation>Selecionar para interromper sempre nas exceções</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation>Interromper sempre nas exceções</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>Adicionar anfitrião permitido</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>Introduzir a direção IP de um anfitrião permitido</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;A direção &lt;b&gt;{0}&lt;/b&gt; não é um direção IP v4 ou IP v6 válida. A cancelar...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>Editar anfitrião permitido</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation>Visor de Variáveis Locais</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation>Ver automaticamente o código fonte quando o usuário altere o quadro da pilha de chamadas no visor de pilha de chamadas.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation>Ver código fonte automáticamente</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation>Selecionar para mostrar informação das exceções na janela da shell</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation>Mostrar exceções na Shell</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
-        <translation>Visor de Variáveis Locais</translation>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation>Ver automaticamente o código fonte quando o usuário altere o quadro da pilha de chamadas no visor de pilha de chamadas.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation>Ver código fonte automáticamente</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation>Selecionar para mostrar informação das exceções na janela da shell</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation>Mostrar exceções na Shell</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished">Número de ficheiros recentes:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -10151,22 +10161,22 @@
         <translation>Editar Ponto de Interrupção</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
         <source>Select, whether the breakpoint is enabled</source>
         <translation>Selecionar se o ponto de interrupção está habilitado</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>Habilitado</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
-        <source>Select whether this is a temporary breakpoint</source>
-        <translation>Selecionar se é um ponto de interrupção temporal</translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <source>Select whether this is a temporary breakpoint</source>
+        <translation>Selecionar se é um ponto de interrupção temporal</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation>Ponto de Interrupção Temporal</translation>
     </message>
@@ -10181,7 +10191,7 @@
         <translation>Introduzir ou selecionar uma condição para o ponto de interrupção</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation>Introduzir a quantidade a ignorar para o ponto de interrupção</translation>
     </message>
@@ -10211,12 +10221,12 @@
         <translation>Condição:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation>Quant. a Ignorar:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation>Adicionar Ponto de Interrupção</translation>
     </message>
@@ -10392,7 +10402,7 @@
         <translation>Desselecionar tudo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation>Verificação ortográfica...</translation>
     </message>
@@ -10632,7 +10642,7 @@
         <translation>Editar ponto de interrupção...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation>Habilitar pontos de interrupção</translation>
     </message>
@@ -10817,257 +10827,257 @@
         <translation>Autocompletar não está disponivel porque a fonte de autocompletar não está definida.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation>Inabilitar ponto de interrupção</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation>Foram cobertas as linhas todas.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation>Dados de Perfil</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation>Escolha um ficheiro de perfil por favor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation>Erro de Sintaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation>Não está disponível a mensagem de erro de sintaxe.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation>Nome de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation>Selecionar um nome de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation>Carregar ficheiro macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation>Ficheiros Macro (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation>Erro ao carregar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; não se pode ler.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; está corrompido.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation>Gravar ficheiro macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation>Gravar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; já existe. Sobreescrever-lo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation>Erro ao gravar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; não pode ser escrito.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation>Iniciar Registo de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>A gravação de macro já está ativada. Começar nova?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation>Gravação de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation>Introduza o nome de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation>Ficheiro alterado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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; não é um ficheiro.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation>Recursos</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation>Adicionar Ficheiro...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation>Adicionar Ficheiros...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation>Adicionar ficheiro com pseudónimo...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation>Adicionar recursos localizado...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation>Adicionar Ficheiro...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation>Adicionar Ficheiros...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation>Adicionar ficheiro com pseudónimo...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation>Adicionar recursos localizado...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resource</source>
         <translation>Adicionar recurso de ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
         <source>Add file resources</source>
         <translation>Adicionar recursos de ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Add aliased file resource</source>
         <translation>Adicionar recurso de ficheiro com pseudónimo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Pseudónimo para o ficheiro &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Package Diagram</source>
         <translation>Diagrama do Pacote</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Include class attributes?</source>
         <translation>Incluir atributos de classes?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation>Diagrama de Imports</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation>Incluir imports de módulos externos?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Application Diagram</source>
         <translation>Diagrama da Aplicação</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Include module names?</source>
         <translation>Incluir nome dos módulos?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation>Adicionar dicionário</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation>Ignorar Tudo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation>Aviso: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation>Erro: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Aviso:&lt;/b&gt; Perderá todas as alterações uma vez que o volte a abrir.</translation>
     </message>
@@ -11082,7 +11092,7 @@
         <translation type="obsolete">Não se pode conetar o fornecedor de autocompletar porque já há outro ativo. Por favor verifique a sua configuração.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11112,27 +11122,27 @@
         <translation>Alteração anterior</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation>Ordenar Linhas</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>A seleção contém dados ilegais para uma ordenação numérica.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation>Não estão disponíveis mensagens de aviso.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation>Estilo: {0}</translation>
     </message>
@@ -11157,7 +11167,7 @@
         <translation>Reabrir Com Codificação</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; foi alterado enquanto estava aberto em eric6. Recarregar?&lt;/p&gt;</translation>
     </message>
@@ -11172,27 +11182,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50634,27 +50644,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Selecionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Selecionar o intérprete de Python{0} a usar:</translation>
     </message>
--- a/i18n/eric6_ru.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_ru.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2149,72 +2149,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>Точки останова</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>Правка...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>Разрешить</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>Разрешить все</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>Запретить</translation>
+        <source>Edit...</source>
+        <translation>Правка...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>Разрешить</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>Запретить все</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>Удалить</translation>
+        <source>Enable all</source>
+        <translation>Разрешить все</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>Запретить</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>Запретить все</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>Удалить все</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>Перейти</translation>
     </message>
     <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
+        <source>Configure...</source>
+        <translation>Настроить...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
+        <source>Enable selected</source>
+        <translation>Разрешить выбранные</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
+        <source>Disable selected</source>
+        <translation>Запретить выбранные</translation>
+    </message>
+    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
-        <source>Configure...</source>
-        <translation>Настроить...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>Разрешить выбранные</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>Запретить выбранные</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
         <source>Delete selected</source>
         <translation>Удалить выбранные</translation>
     </message>
@@ -6645,90 +6645,100 @@
         <translation>Точка останова с тремя состояниями</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation>Исключения</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation>Всегда останавливаться при исключениях</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation>Всегда останавливаться при исключениях</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>Добавить допустимый хост</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>Задайте IP адрес допустимого хоста</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Введённый адрес &lt;b&gt;{0}&lt;/b&gt; не является верным IP v4 или IP v6 адресом. Прервано...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>Редактировать допустимый хост</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation>Просмотр локальных переменных</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation>Автоматический просмотр исходного кода когда пользователь меняет стек вызовов в окне стека вызовов.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation>Автоматический просмотр исходного кода</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation>Разрешить показ информации исключения в окне оболочки</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation>Отображать исключения в оболочке</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation>Максимальный размер переменной:</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
-        <translation>Просмотр локальных переменных</translation>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
+        <translation>Задайте максимальный размер отображаемой переменной (0 = без ограничений)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation>Автоматический просмотр исходного кода когда пользователь меняет стек вызовов в окне стека вызовов.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation>Автоматический просмотр исходного кода</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation>Разрешить показ информации исключения в окне оболочки</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation>Отображать исключения в оболочке</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation>Максимальный размер переменной:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation>Задайте максимальный размер отображаемой переменной (0 = без ограничений)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation>без ограничений</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation> байта(ов)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation>Просмотр переменных</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished">Число недавних файлов:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -9713,22 +9723,22 @@
         <translation>Редактировать точку останова</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
         <source>Select, whether the breakpoint is enabled</source>
         <translation>Разрешены точки останова</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>Включена</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
-        <source>Select whether this is a temporary breakpoint</source>
-        <translation>Разрешить временные точки останова</translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <source>Select whether this is a temporary breakpoint</source>
+        <translation>Разрешить временные точки останова</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation>Временная точка останова</translation>
     </message>
@@ -9743,7 +9753,7 @@
         <translation>Введите или выберите условие точки останова</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation>Количество игнорируемых попаданий для точки останова</translation>
     </message>
@@ -9768,12 +9778,12 @@
         <translation>Условие:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation>Счетчик игнорируемых попаданий:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation>Добавить точку останова</translation>
     </message>
@@ -9944,7 +9954,7 @@
         <translation>Снять выделение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation>Проверка орфографии...</translation>
     </message>
@@ -10169,7 +10179,7 @@
         <translation>Редактировать точку останова...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation>Разрешить точку останова</translation>
     </message>
@@ -10354,257 +10364,257 @@
         <translation>Автодополнение недоступно, так как не задан источник автодополнения.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation>Запретить точку останова</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation>Охват кода</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation>Пожалуйста, выберите файл для информации охвата</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Показать аннотации по охвату</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation>Все строки выполняются.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation>Нет файла с информацией по охвату.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation>Данные профайлера</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation>Пожалуйста, выберите файл профиля</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation>Синтаксическая ошибка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation>Нет сообщения о синтаксической ошибке.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation>Имя макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation>Задайте имя макроса:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation>Загрузить макрос</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation>Макросы (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation>Ошибка при загрузке макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл с макросами: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл с макросами &lt;b&gt;{0}&lt;/b&gt; повреждён&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation>Сохранить файл с макросами</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation>Сохранить макрос</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Макро &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation>Ошибка при сохранении макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл с макросами: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation>Начать запись макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Запись макроса уже идёт. Начать новую запись?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation>Запись макроса</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation>Задайте имя макроса:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation>Файл изменен</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation>{0} (только чтение)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation>Ошибка Drag&amp;&amp;Drop</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation>Ресурсы</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation>Добавить файл...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation>Добавить файлы...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation>Добавить файл под другим именем...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation>Добавить локализованный ресурс...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation>Добавить файл...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation>Добавить файлы...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation>Добавить файл под другим именем...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation>Добавить локализованный ресурс...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation>Добавить фрагмент ресурсов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resource</source>
         <translation>Добавить файл ресурсов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
         <source>Add file resources</source>
         <translation>Добавить файлы ресурсов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Add aliased file resource</source>
         <translation>Добавить файл ресурсов под другим именем</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Другое имя для файла &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Package Diagram</source>
         <translation>Диаграмма пакетов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Include class attributes?</source>
         <translation>Включать атрибуты класса?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation>Диаграмма импортов</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation>Включать импорты из внешних модулей?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Application Diagram</source>
         <translation>Диаграмма приложения</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Include module names?</source>
         <translation>Включать имена модулей?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation>Добавить в словарь</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation>Игнорировать всё</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation>Предупреждение: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation>Ошибка: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Предупреждение:&lt;/b&gt; При переоткрытии все изменения будут потеряны.</translation>
     </message>
@@ -10629,27 +10639,27 @@
         <translation>Предыдущее изменение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation>Сортировать строки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>Выборка содержит данные неподходящие для сортировки как числа.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation>Нет предупреждающего сообщения.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation>Стиль: {0}</translation>
     </message>
@@ -10674,7 +10684,7 @@
         <translation>Открыть заново с кодировкой</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл &lt;b&gt;{0}&lt;/b&gt; был изменён, будучи открытым в Eric6. Обновить?&lt;/p&gt;</translation>
     </message>
@@ -10689,32 +10699,32 @@
         <translation>Дополнить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation>Источник автодополнений</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Список дополнений источника &apos;{0}&apos; уже зарегистрирован. Повторный запрос проигнорирован.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation>Источник всплывающих подсказок</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Источник всплывающих подсказок &apos;{0}&apos; уже зарегистрирован. Повторный запрос проигнорирован.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation>Регистрация обработчика кликов мышки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Обработчик кликов мышки для &quot;{0}&quot; уже зарегистрирован &quot;{1}&quot;. Запрос прерван &quot;{2}&quot;...</translation>
     </message>
@@ -49339,27 +49349,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Задайте интерпретатор Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Задайте интерпретатор Python{0}:</translation>
     </message>
--- a/i18n/eric6_tr.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_tr.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2218,72 +2218,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>Durmanoktası</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
         <source>Add</source>
         <translation>Ekle</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>Düzenle...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>Etkinleştir</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>Hepsini etkinleştir</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>Onaylama</translation>
+        <source>Edit...</source>
+        <translation>Düzenle...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>Etkinleştir</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>Hepsini Onaylama</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>Sil</translation>
+        <source>Enable all</source>
+        <translation>Hepsini etkinleştir</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>Onaylama</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>Hepsini Onaylama</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>Sil</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>Hepsini sil</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>Buraya git</translation>
     </message>
     <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
+        <source>Configure...</source>
+        <translation>Ayarlanıyor...</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
+        <source>Enable selected</source>
+        <translation>Seçilenleri Etkinleştir</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
+        <source>Disable selected</source>
+        <translation>Seçileni Onaylama</translation>
+    </message>
+    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
-        <source>Configure...</source>
-        <translation>Ayarlanıyor...</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>Seçilenleri Etkinleştir</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>Seçileni Onaylama</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
         <source>Delete selected</source>
         <translation>Seçileni Sil</translation>
     </message>
@@ -6725,90 +6725,100 @@
         <translation>Beklememoktasının üç durumu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation>İstisnalar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation>İstisna durumunda daima durdurmayı seç</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation>İstisna durumunda daima durdur</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>İzin verilen hostlara ekle</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>İzin verilen hosların IP numaralrını giriniz</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>İzin verilen Hostları düzenle</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished">Geçmiş dosyaların sayısı:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -10015,22 +10025,22 @@
         <translation>Bekleme Noktasını Düzenle</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
         <source>Select, whether the breakpoint is enabled</source>
         <translation>seçin, bekleme noktasının olup olmadığını görmek için</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>Etkinleştirilmiş</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>
-        <source>Select whether this is a temporary breakpoint</source>
-        <translation>bunun bir geçici bekleme noktası olup olmadığını anlamak için seçiniz</translation>
-    </message>
-    <message>
         <location filename="../Debugger/EditBreakpointDialog.ui" line="141"/>
+        <source>Select whether this is a temporary breakpoint</source>
+        <translation>bunun bir geçici bekleme noktası olup olmadığını anlamak için seçiniz</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="144"/>
         <source>Temporary Breakpoint</source>
         <translation>Geçici Beklemenoktası</translation>
     </message>
@@ -10045,7 +10055,7 @@
         <translation>Beklemenoktası koşullarını girin yada seçin</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="112"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="115"/>
         <source>Enter an ignore count for the breakpoint</source>
         <translation>Beklemenoktası yoksayma sayısını giriniz</translation>
     </message>
@@ -10075,12 +10085,12 @@
         <translation>Koşul:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="105"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="108"/>
         <source>Ignore Count:</source>
         <translation>Sayımı Yoksay:</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.py" line="87"/>
+        <location filename="../Debugger/EditBreakpointDialog.py" line="89"/>
         <source>Add Breakpoint</source>
         <translation>Bekleme Noktası Ekle</translation>
     </message>
@@ -10256,7 +10266,7 @@
         <translation>Tüm seçimi iptal et</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7383"/>
+        <location filename="../QScintilla/Editor.py" line="7394"/>
         <source>Check spelling...</source>
         <translation>Yazım Kontrolü...</translation>
     </message>
@@ -10496,7 +10506,7 @@
         <translation>Bekleme noktasını düzenle...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5295"/>
+        <location filename="../QScintilla/Editor.py" line="5306"/>
         <source>Enable breakpoint</source>
         <translation>Beklemenoktasını etkinleştir</translation>
     </message>
@@ -10676,237 +10686,237 @@
         <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5298"/>
+        <location filename="../QScintilla/Editor.py" line="5309"/>
         <source>Disable breakpoint</source>
         <translation>Durmanoktasını iptal et</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Code Coverage</source>
         <translation>Kod Koruyucu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5672"/>
+        <location filename="../QScintilla/Editor.py" line="5683"/>
         <source>Please select a coverage file</source>
         <translation>Lütfen bir koruyucu dosya seçiniz</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Kodların Dipnotunu Göster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5728"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>All lines have been covered.</source>
         <translation>Tüm satırlar korumaya alındı.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5735"/>
+        <location filename="../QScintilla/Editor.py" line="5746"/>
         <source>There is no coverage file available.</source>
         <translation>Hazırda koruma dosyası yok.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Profile Data</source>
         <translation>Veri Kesiti</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <location filename="../QScintilla/Editor.py" line="5861"/>
         <source>Please select a profile file</source>
         <translation>Lütfen kesit dosyasını seçiniz</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>Syntax Error</source>
         <translation>Sözdizimi Hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6010"/>
+        <location filename="../QScintilla/Editor.py" line="6021"/>
         <source>No syntax error message available.</source>
         <translation>Uygun söz dizimi hata mesajı yok.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Macro Name</source>
         <translation>Makro Adı</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6325"/>
+        <location filename="../QScintilla/Editor.py" line="6336"/>
         <source>Select a macro name:</source>
         <translation>Bir makro ismi seç:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6364"/>
         <source>Load macro file</source>
         <translation>Makro dosyasını yükle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Macro files (*.macro)</source>
         <translation>Makro dosyaları (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>Error loading macro</source>
         <translation>Makronun yüklenmesinde hata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; okunamıyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6376"/>
+        <location filename="../QScintilla/Editor.py" line="6387"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; bozuk.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6396"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Save macro file</source>
         <translation>Makro Dosyasını Kaydet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Save macro</source>
         <translation>Makro Kaydet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>Error saving macro</source>
         <translation>Makronun kaydedilmesinde hata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6429"/>
+        <location filename="../QScintilla/Editor.py" line="6440"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; yazılamıyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Start Macro Recording</source>
         <translation>Makro Kaydı Başladı</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6442"/>
+        <location filename="../QScintilla/Editor.py" line="6453"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Macro Recording</source>
         <translation>Makro Kaydediliyor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6468"/>
+        <location filename="../QScintilla/Editor.py" line="6479"/>
         <source>Enter name of the macro:</source>
         <translation>Makronun ismini gir:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6606"/>
+        <location filename="../QScintilla/Editor.py" line="6617"/>
         <source>File changed</source>
         <translation>Dosya değiştirilmiş</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6770"/>
+        <location filename="../QScintilla/Editor.py" line="6781"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <source>Drop Error</source>
         <translation>Düşme hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6910"/>
+        <location filename="../QScintilla/Editor.py" line="6921"/>
         <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; bir dosya değil.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6931"/>
+        <location filename="../QScintilla/Editor.py" line="6942"/>
         <source>Resources</source>
         <translation>Kaynaklar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
-        <source>Add file...</source>
-        <translation>Dosya ekle...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6935"/>
-        <source>Add files...</source>
-        <translation>Dosyaları ekle...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6937"/>
-        <source>Add aliased file...</source>
-        <translation>Kısaltmalar dosyasına ekle...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6940"/>
-        <source>Add localized resource...</source>
-        <translation>Yaral kaynak ekle...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6944"/>
+        <source>Add file...</source>
+        <translation>Dosya ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6946"/>
+        <source>Add files...</source>
+        <translation>Dosyaları ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6948"/>
+        <source>Add aliased file...</source>
+        <translation>Kısaltmalar dosyasına ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6951"/>
+        <source>Add localized resource...</source>
+        <translation>Yaral kaynak ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6955"/>
         <source>Add resource frame</source>
         <translation>Çerçeve kaynağı ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6963"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resource</source>
         <translation>Dosya kaynağını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6979"/>
+        <location filename="../QScintilla/Editor.py" line="6990"/>
         <source>Add file resources</source>
         <translation>Dosya kaynaklarını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Add aliased file resource</source>
         <translation>Kısaltmalar dosyası kaynağını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7007"/>
+        <location filename="../QScintilla/Editor.py" line="7018"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>&lt;b&gt;{0} dosyası için takma ad&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Package Diagram</source>
         <translation>Paket Şeması</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7071"/>
+        <location filename="../QScintilla/Editor.py" line="7082"/>
         <source>Include class attributes?</source>
         <translation>Sınıf nitelikleri dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Imports Diagram</source>
         <translation>Şemayı İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7091"/>
+        <location filename="../QScintilla/Editor.py" line="7102"/>
         <source>Include imports from external modules?</source>
         <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Application Diagram</source>
         <translation>Uygulama Şeması</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7105"/>
+        <location filename="../QScintilla/Editor.py" line="7116"/>
         <source>Include module names?</source>
         <translation>Modül isimleri dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7386"/>
+        <location filename="../QScintilla/Editor.py" line="7397"/>
         <source>Add to dictionary</source>
         <translation>Sözlüğe ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7388"/>
+        <location filename="../QScintilla/Editor.py" line="7399"/>
         <source>Ignore All</source>
         <translation>Hepsini Yoksay</translation>
     </message>
@@ -10916,22 +10926,22 @@
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; dosyası halen mevcut. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6264"/>
+        <location filename="../QScintilla/Editor.py" line="6275"/>
         <source>Warning: {0}</source>
         <translation>Dikkat: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6271"/>
+        <location filename="../QScintilla/Editor.py" line="6282"/>
         <source>Error: {0}</source>
         <translation>Hata: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6413"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; zaten var. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6602"/>
+        <location filename="../QScintilla/Editor.py" line="6613"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10956,27 +10966,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7800"/>
+        <location filename="../QScintilla/Editor.py" line="7811"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>Warning</source>
         <translation type="unfinished">Dikkat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6211"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6261"/>
+        <location filename="../QScintilla/Editor.py" line="6272"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11001,7 +11011,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6596"/>
+        <location filename="../QScintilla/Editor.py" line="6607"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Eric5 ile açıldıktan sonra &lt;b&gt;{0}&lt;/b&gt; dosyasında değişiklik olmuş. Yeniden açılsın mı?&lt;/p&gt; {0}?} {6.?}</translation>
     </message>
@@ -11016,32 +11026,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4623"/>
+        <location filename="../QScintilla/Editor.py" line="4632"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4881"/>
+        <location filename="../QScintilla/Editor.py" line="4892"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7887"/>
+        <location filename="../QScintilla/Editor.py" line="7898"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50028,27 +50038,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1625"/>
+        <location filename="../Preferences/__init__.py" line="1628"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1653"/>
+        <location filename="../Preferences/__init__.py" line="1656"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1755"/>
+        <location filename="../Preferences/__init__.py" line="1758"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_zh_CN.ts	Fri Dec 22 16:36:02 2017 +0100
+++ b/i18n/eric6_zh_CN.ts	Fri Dec 22 17:56:49 2017 +0100
@@ -2231,72 +2231,72 @@
 <context>
     <name>BreakPointViewer</name>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="50"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="53"/>
         <source>Breakpoints</source>
         <translation>断点</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="184"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="189"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="151"/>
-        <source>Edit...</source>
-        <translation>编辑…</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="153"/>
-        <source>Enable</source>
-        <translation>允许</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="188"/>
-        <source>Enable all</source>
-        <translation>允许所有</translation>
-    </message>
-    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="156"/>
-        <source>Disable</source>
-        <translation>禁止</translation>
+        <source>Edit...</source>
+        <translation>编辑…</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="158"/>
+        <source>Enable</source>
+        <translation>允许</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="193"/>
-        <source>Disable all</source>
-        <translation>禁止所有</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="160"/>
-        <source>Delete</source>
-        <translation>删除</translation>
+        <source>Enable all</source>
+        <translation>允许所有</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="161"/>
+        <source>Disable</source>
+        <translation>禁止</translation>
     </message>
     <message>
         <location filename="../Debugger/BreakPointViewer.py" line="198"/>
+        <source>Disable all</source>
+        <translation>禁止所有</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="165"/>
+        <source>Delete</source>
+        <translation>删除</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="203"/>
         <source>Delete all</source>
         <translation>全部删除</translation>
     </message>
     <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="163"/>
+        <location filename="../Debugger/BreakPointViewer.py" line="168"/>
         <source>Goto</source>
         <translation>跳转</translation>
     </message>
     <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="206"/>
+        <source>Configure...</source>
+        <translation>配置…</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
+        <source>Enable selected</source>
+        <translation>允许所选择的</translation>
+    </message>
+    <message>
+        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
+        <source>Disable selected</source>
+        <translation>禁止所选择的</translation>
+    </message>
+    <message>
         <location filename="../Debugger/BreakPointViewer.py" line="201"/>
-        <source>Configure...</source>
-        <translation>配置…</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="186"/>
-        <source>Enable selected</source>
-        <translation>允许所选择的</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="191"/>
-        <source>Disable selected</source>
-        <translation>禁止所选择的</translation>
-    </message>
-    <message>
-        <location filename="../Debugger/BreakPointViewer.py" line="196"/>
         <source>Delete selected</source>
         <translation>删除所选择的</translation>
     </message>
@@ -6715,17 +6715,17 @@
         <translation>自动保存已更改的脚本</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="261"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="266"/>
         <source>Add allowed host</source>
         <translation>添加允许的主机</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="283"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="288"/>
         <source>Enter the IP address of an allowed host</source>
         <translation>输入允许主机的 IP 地址</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>Edit allowed host</source>
         <translation>编辑允许的主机</translation>
     </message>
@@ -6765,75 +6765,85 @@
         <translation type="unfinished">断点</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="582"/>
         <source>Exceptions</source>
         <translation type="unfinished">异常</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="588"/>
         <source>Select to always break at exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="551"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/>
         <source>Always break at exceptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="294"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="299"/>
         <source>&lt;p&gt;The entered address &lt;b&gt;{0}&lt;/b&gt; is not a valid IP v4 or IP v6 address. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="666"/>
+        <source>Local Variables Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="672"/>
+        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="675"/>
+        <source>Automatically view source code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <source>Select to show exception information in the shell window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="601"/>
+        <source>Show exceptions in Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="619"/>
+        <source>Max. Variable Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="626"/>
-        <source>Local Variables Viewer</source>
+        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="632"/>
-        <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="635"/>
-        <source>Automatically view source code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="558"/>
-        <source>Select to show exception information in the shell window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="561"/>
-        <source>Show exceptions in Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="579"/>
-        <source>Max. Variable Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="586"/>
-        <source>Enter the maximum size of a variable to be shown (0 = no limit)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="592"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="598"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="638"/>
         <source> Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="611"/>
         <source>Variables Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/>
+        <source>Number of recent files and conditions:</source>
+        <translation type="unfinished">最近文件的数目:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="548"/>
+        <source>Enter the number of recent files and breakpoint conditions to remember</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DebuggerInterfacePython</name>
@@ -10010,22 +10020,22 @@
         <translation>编辑断点</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="148"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
         <source>Select, whether the breakpoint is enabled</source>
         <translation>选择是否允许断点</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="151"/>
+        <location filename="../Debugger/EditBreakpointDialog.ui" line="154"/>
         <source>Enabled</source>
         <translation>已开启</translation>
     </message>
     <message>
-        <location filename="../Debugger/EditBreakpointDialog.ui" line="138"/>