eric: changeset 5461:b0dc3f0133cd

--- a/Debugger/ExceptionsFilterDialog.ui	Tue Jan 31 18:33:52 2017 +0100
+++ b/Debugger/ExceptionsFilterDialog.ui	Tue Jan 31 18:43:09 2017 +0100
@@ -1,113 +1,106 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ExceptionsFilterDialog</class>
- <widget class="QDialog" name="ExceptionsFilterDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ExceptionsFilterDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>464</width>
-    <height>385</height>
+    <width>450</width>
+    <height>400</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Exceptions Filter</string>
   </property>
-  <property name="whatsThis" >
-   <string>&lt;b>Exception Filter&lt;/b>
-&lt;p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.&lt;/p>
-&lt;p>Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p></string>
+  <property name="whatsThis">
+   <string>&lt;b&gt;Exception Filter&lt;/b&gt;
+&lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
+&lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <item>
-    <widget class="QListWidget" name="exceptionList" >
-     <property name="toolTip" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="3">
+    <widget class="QListWidget" name="exceptionList">
+     <property name="toolTip">
       <string>List of exceptions that shall be highlighted</string>
      </property>
-     <property name="alternatingRowColors" >
+     <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" >
-     <item>
-      <widget class="QPushButton" name="addButton" >
-       <property name="enabled" >
-        <bool>false</bool>
-       </property>
-       <property name="toolTip" >
-        <string>Press to add the entered exception to the list</string>
-       </property>
-       <property name="text" >
-        <string>Add</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="exceptionEdit" >
-       <property name="toolTip" >
-        <string>Enter an exception type that shall be highlighted</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item row="1" column="0">
+    <widget class="QPushButton" name="addButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolTip">
+      <string>Press to add the entered exception to the list</string>
+     </property>
+     <property name="text">
+      <string>Add</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QLineEdit" name="exceptionEdit">
+     <property name="toolTip">
+      <string>Enter an exception type that shall be highlighted</string>
+     </property>
+    </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
-     <item>
-      <widget class="QPushButton" name="deleteButton" >
-       <property name="enabled" >
-        <bool>false</bool>
-       </property>
-       <property name="toolTip" >
-        <string>Press to delete the selected exception from the list</string>
-       </property>
-       <property name="text" >
-        <string>Delete</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="deleteAllButton" >
-       <property name="toolTip" >
-        <string>Press to delete all exceptions from the list</string>
-       </property>
-       <property name="text" >
-        <string>Delete All</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer" >
-       <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 row="2" column="0">
+    <widget class="QPushButton" name="deleteButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolTip">
+      <string>Press to delete the selected exception from the list</string>
+     </property>
+     <property name="text">
+      <string>Delete</string>
+     </property>
+    </widget>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+   <item row="2" column="1">
+    <widget class="QPushButton" name="deleteAllButton">
+     <property name="toolTip">
+      <string>Press to delete all exceptions from the list</string>
+     </property>
+     <property name="text">
+      <string>Delete All</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>261</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>exceptionList</tabstop>
@@ -125,11 +118,11 @@
    <receiver>ExceptionsFilterDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>26</x>
      <y>309</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>26</x>
      <y>325</y>
     </hint>
@@ -141,11 +134,11 @@
    <receiver>ExceptionsFilterDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>85</x>
      <y>310</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>85</x>
      <y>324</y>
     </hint>
--- a/Debugger/VariablesFilterDialog.py	Tue Jan 31 18:33:52 2017 +0100
+++ b/Debugger/VariablesFilterDialog.py	Tue Jan 31 18:43:09 2017 +0100
@@ -47,6 +47,9 @@
             for varType, varTypeStr in ConfigVarTypeDispStrings.items():
                 itm = QListWidgetItem(self.tr(varTypeStr), widget)
                 itm.setData(Qt.UserRole, ConfigVarTypeFilters[varType])
+                itm.setFlags(Qt.ItemIsEnabled | Qt.ItemIsUserCheckable |
+                             Qt.ItemNeverHasChildren)
+                itm.setCheckState(Qt.Unchecked)
                 widget.addItem(itm)

         lDefaultFilter, gDefaultFilter = Preferences.getVarFilters()
@@ -62,13 +65,13 @@
         lList = []
         for row in range(self.localsList.count()):
             itm = self.localsList.item(row)
-            if itm.isSelected():
+            if itm.checkState() == Qt.Unchecked:
                 lList.append(itm.data(Qt.UserRole))

         gList = []
         for row in range(self.globalsList.count()):
             itm = self.globalsList.item(row)
-            if itm.isSelected():
+            if itm.checkState() == Qt.Unchecked:
                 gList.append(itm.data(Qt.UserRole))
         return (lList, gList)

@@ -81,11 +84,17 @@
         """
         for row in range(self.localsList.count()):
             itm = self.localsList.item(row)
-            itm.setSelected(itm.data(Qt.UserRole) in lList)
+            if itm.data(Qt.UserRole) in lList:
+                itm.setCheckState(Qt.Unchecked)
+            else:
+                itm.setCheckState(Qt.Checked)

         for row in range(self.globalsList.count()):
             itm = self.globalsList.item(row)
-            itm.setSelected(itm.data(Qt.UserRole) in gList)
+            if itm.data(Qt.UserRole) in gList:
+                itm.setCheckState(Qt.Unchecked)
+            else:
+                itm.setCheckState(Qt.Checked)

     def on_buttonBox_clicked(self, button):
         """
--- a/Debugger/VariablesFilterDialog.ui	Tue Jan 31 18:33:52 2017 +0100
+++ b/Debugger/VariablesFilterDialog.ui	Tue Jan 31 18:43:09 2017 +0100
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>386</width>
-    <height>338</height>
+    <width>400</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,45 +21,45 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <item row="2" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Select the variable types to be shown in the variables viewers:</string>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     <property name="wordWrap">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="localsLabel">
      <property name="text">
-      <string>&amp;Locals Filter</string>
+      <string>&amp;Locals Viewer</string>
      </property>
      <property name="buddy">
       <cstring>localsList</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="1" column="1">
     <widget class="QLabel" name="globalsLabel">
      <property name="text">
-      <string>&amp;Globals Filter</string>
+      <string>&amp;Globals Viewer</string>
      </property>
      <property name="buddy">
       <cstring>globalsList</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
     <widget class="QListWidget" name="localsList">
      <property name="toolTip">
       <string>Locals Filter List</string>
      </property>
      <property name="whatsThis">
       <string>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</string>
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</string>
      </property>
      <property name="alternatingRowColors">
       <bool>true</bool>
@@ -72,14 +72,14 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <widget class="QListWidget" name="globalsList">
      <property name="toolTip">
       <string>Globals Filter List</string>
      </property>
      <property name="whatsThis">
       <string>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</string>
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</string>
      </property>
      <property name="alternatingRowColors">
       <bool>true</bool>
@@ -92,6 +92,16 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
--- a/changelog	Tue Jan 31 18:33:52 2017 +0100
+++ b/changelog	Tue Jan 31 18:43:09 2017 +0100
@@ -4,6 +4,8 @@
 - bug fixes
 - Checkers
   -- upgraded pycodestyle to version 2.2.0+
+- Debugger
+  -- changed the variables filter dialog to be more user friendly
 - Editor
   -- added a bar with formatting options for HTML, Markdown and reStructured
      Text files
--- a/i18n/eric6_cs.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_cs.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -14936,54 +14936,54 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Filtr výjimek&lt;/b&gt;&lt;p&gt;Tento dialog je použit pro zadání typů výjimek, které mají být zvýrazněny během debugování. Je-li tento seznam prázdný, tak budou zvýrazněny všechny výjimky. Jestliže je přepínač v dialogu &quot;Spustit debugování&quot; vypnutý, tak žádné výjimky zobrazovány nebudou.&lt;/p&gt;&lt;p&gt;Všimněte si, že neošetřené výjimky jsou vždy zvýrazněny nezávisle na těchto nastaveních.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation>Zadejte typ výjimky, která má být zvýrazněna</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation>Seznam výjimek, které budou zvýrazněny</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation>Stisknout pro přidání zadané výjimky do seznamu</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation>Stisknout pro smazání vybraných výjimek ze seznamu</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>Filtr výjimek</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation>Stisknout pro smazání všech výjimek v seznamu</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>Smazat vše</translation>
     </message>
@@ -64692,13 +64692,13 @@
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>Filtr &amp;lokálních proměnných</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation type="unfinished">Filtr &amp;lokálních proměnných</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>Filtr &amp;globálních proměnných</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation type="unfinished">Filtr &amp;globálních proměnných</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/>
@@ -64708,8 +64708,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Filtrovaný seznam lokálních proměnných&lt;/b&gt;&lt;p&gt;Výběr typů lokálních proměnných, které chcete filtrovat.&lt;/p&gt;</translation>
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Filtrovaný seznam lokálních proměnných&lt;/b&gt;&lt;p&gt;Výběr typů lokálních proměnných, které chcete filtrovat.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="78"/>
@@ -64719,14 +64719,19 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Filtrovaný seznam globálních proměnných&lt;/b&gt;&lt;p&gt;Výběr typů globálních proměnných, které chcete filtrovat.&lt;/p&gt;</translation>
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Filtrovaný seznam globálních proměnných&lt;/b&gt;&lt;p&gt;Výběr typů globálních proměnných, které chcete filtrovat.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.py" line="42"/>
         <source>Save Default</source>
         <translation>Uložit default</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_de.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -390,7 +390,7 @@
 <context>
     <name>AddBookmarkDialog</name>
     <message>
-        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
+        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
         <source>Add Bookmark</source>
         <translation>Lesezeichen hinzufügen</translation>
     </message>
@@ -1727,7 +1727,7 @@
         <translation>&amp;Adresse editieren</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
@@ -2424,12 +2424,12 @@
         <translation>Drücken, um die Aufrufverfolgung in eine Textdatei zu speichern</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>From</source>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation>Nach</translation>
     </message>
@@ -2595,7 +2595,7 @@
         <translation>Drücken, um eine verteilte Änderungssitzung abzubrechen</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
@@ -2892,7 +2892,7 @@
 <context>
     <name>ClickToFlashWhitelistDialog</name>
     <message>
-        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
+        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
         <source>ClickToFlash Whitelist</source>
         <translation>ClickToFlash Whitelist</translation>
     </message>
@@ -4818,7 +4818,7 @@
         <translation>Domain:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation>&lt;kein Cookie ausgewählt&gt;</translation>
     </message>
@@ -7390,7 +7390,7 @@
 <context>
     <name>DownloadManager</name>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
@@ -7850,92 +7850,92 @@
         <translation>Standard Knöpfe</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
         <source>Abort</source>
         <translation>Abbrechen (Abort)</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
         <source>Cancel</source>
         <translation>Abbrechen (Cancel)</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
         <source>Discard</source>
         <translation>Verwerfen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
         <source>No to all</source>
         <translation>Nein zu allen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
         <source>Restore defaults</source>
         <translation>Auf Standardwerte zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
         <source>Retry</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
         <source>Save all</source>
         <translation>Alles speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
         <source>Yes to all</source>
         <translation>Ja zu allen</translation>
     </message>
@@ -9952,7 +9952,7 @@
         <translation>Drücken, um eine API-Datei aus der Liste installierter API-Dateien zu wählen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/>
         <source>Add from installed APIs</source>
         <translation>Von installierten APIs hinzufügen</translation>
     </message>
@@ -9962,7 +9962,7 @@
         <translation>Drücke, um die gewählte APIs Zusammenstellung zu übersetzen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/>
         <source>Compile APIs</source>
         <translation>APIs übersetzen</translation>
     </message>
@@ -9987,7 +9987,7 @@
         <translation>Drücken, um eine API-Datei aus der Liste von API-Dateien, die von Plugins installierter wurden, zu wählen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/>
         <source>Add from Plugin APIs</source>
         <translation>Von Plugin APIs hinzufügen</translation>
     </message>
@@ -11084,7 +11084,7 @@
         <translation>Wähle den Modus „Füllen bis zum Zeilenende“.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/>
         <source>Fill to end of line</source>
         <translation>Füllen bis zum Zeilenende</translation>
     </message>
@@ -11129,7 +11129,7 @@
         <translation>Wähle die Schriftart aus.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
@@ -12575,7 +12575,7 @@
         <translation>Modus:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>Ausgeschaltet</translation>
     </message>
@@ -13369,7 +13369,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.ui" line="13"/>
+        <location filename="../UI/EmailDialog.py" line="346"/>
         <source>Send bug report</source>
         <translation>Sende Fehlerbericht</translation>
     </message>
@@ -14528,7 +14528,7 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
@@ -14537,47 +14537,47 @@
 &lt;p&gt;Bitte beachten Sie, dass alle nicht abgefangenen Ausnahmen unabhängig von der Liste angezeigt werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation>Gib einen anzuzeigenden Ausnahmetyp ein</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation>Liste der anzuzeigenden Ausnahmen</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation>Fügt die eingegebene Ausnahme zu der Liste hinzu</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation>Löscht die ausgewählte Ausnahme aus der Liste</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>Ausnahmen Filter</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation>Drücken, um alle aufgelisteten Ausnahmen zu löschen</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>Alle Löschen</translation>
     </message>
@@ -14797,12 +14797,12 @@
         <translation>Benachrichtigungen</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
         <source>Host</source>
         <translation>Rechner</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
         <source>Permission</source>
         <translation>Berechtigung</translation>
     </message>
@@ -14817,7 +14817,7 @@
         <translation>Alle entfernen</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
         <source>Geolocation</source>
         <translation>Geolokalisierung</translation>
     </message>
@@ -15941,7 +15941,7 @@
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation>&lt;kein Flash Cookie ausgewählt&gt;</translation>
     </message>
@@ -15951,7 +15951,7 @@
         <translation>Größe:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
         <source>Origin:</source>
         <translation>Ursprung:</translation>
     </message>
@@ -15986,7 +15986,7 @@
         <translation>Drücken, um ausgewählte Flash Cookies zu entfernen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
         <source>Remove Cookie</source>
         <translation>Cookie entfernen</translation>
     </message>
@@ -16414,7 +16414,7 @@
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
     <message>
-        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
+        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
         <source>GreaseMonkey Script Installation</source>
         <translation>GreaseMonkey-Skriptinstallation</translation>
     </message>
@@ -22010,7 +22010,7 @@
 <context>
     <name>HgAddSubrepositoryDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
         <source>Add Sub-repository</source>
         <translation>Unterrepository hinzufügen</translation>
     </message>
@@ -23193,7 +23193,7 @@
         <translation>Drücken, um die ausgewählten Einträge als &apos;aufgelöst&apos; zu markieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
         <source>Resolved</source>
         <translation>Aufgelöst</translation>
     </message>
@@ -23203,7 +23203,7 @@
         <translation>Drücken, um die ausgewählten Einträge als &apos;nicht aufgelöst&apos; zu markieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
         <source>Unresolved</source>
         <translation>Nicht Aufgelöst</translation>
     </message>
@@ -23796,7 +23796,7 @@
         <translation>Wähle die als Filter zu verwendende Kategorie</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
         <source>Revision</source>
         <translation>Revision</translation>
     </message>
@@ -24168,7 +24168,7 @@
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geladen werden.&lt;br/&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>Edit Plan</source>
         <translation>Plan bearbeiten</translation>
     </message>
@@ -24309,7 +24309,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/>
         <source>Mercurial Log</source>
         <translation>Mercurial-Log</translation>
     </message>
@@ -24339,17 +24339,17 @@
         <translation>Wähle das als Filter zu verwendende Feld</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/>
         <source>Revision</source>
         <translation>Revision</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
@@ -28074,7 +28074,7 @@
 <context>
     <name>HgStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
         <source>Mercurial Status</source>
         <translation>Mercurial-Status</translation>
     </message>
@@ -28216,7 +28216,7 @@
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
         <source>Commit</source>
         <translation>Einpflegen</translation>
     </message>
@@ -28336,7 +28336,7 @@
         <translation>alle</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
         <source>Differences</source>
         <translation>Unterschiede</translation>
     </message>
@@ -29606,7 +29606,7 @@
         <translation>Drücken, um die ausgwählten Einträge zu löschen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation>&amp;Entfernen</translation>
     </message>
@@ -35707,92 +35707,92 @@
         <translation>Standard Knöpfe</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
         <source>Abort</source>
         <translation>Abbrechen (Abort)</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
         <source>Cancel</source>
         <translation>Abbrechen (Cancel)</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
         <source>Save all</source>
         <translation>Alles speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
         <source>Discard</source>
         <translation>Verwerfen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
         <source>Yes to all</source>
         <translation>Ja zu allen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
         <source>No to all</source>
         <translation>Nein zu allen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
         <source>Retry</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
         <source>Restore defaults</source>
         <translation>Auf Standardwerte zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
@@ -37532,7 +37532,7 @@
 <context>
     <name>NoCacheHostsDialog</name>
     <message>
-        <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
+        <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
         <source>Not Cached Hosts</source>
         <translation>Nicht Gecachte Hosts</translation>
     </message>
@@ -37640,7 +37640,7 @@
         <translation>Einschalten, um die Position visuell auszuwählen, ausschalten, um sie einzulesen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
         <source>Visual Selection</source>
         <translation>Visuelle Auswahl</translation>
     </message>
@@ -38313,7 +38313,7 @@
 <context>
     <name>PasswordsDialog</name>
     <message>
-        <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
         <source>Saved Passwords</source>
         <translation>Gespeicherte Passwörter</translation>
     </message>
@@ -43112,7 +43112,7 @@
         <translation>Ausgeführt</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation>Abdeckung</translation>
     </message>
@@ -43162,7 +43162,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
         <source>%v/%m Files</source>
         <translation>%v/%m Dateien</translation>
     </message>
@@ -43185,7 +43185,7 @@
         <translation>Lösche alle Informationen</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
+        <location filename="../DataViews/PyProfileDialog.py" line="233"/>
         <source>Profile Results</source>
         <translation>Profilergebnisse</translation>
     </message>
@@ -47916,7 +47916,7 @@
         <translation>Drücken, um die ausgewählten Filter zu löschen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
         <source>Remove Filters</source>
         <translation>Filter löschen</translation>
     </message>
@@ -47926,7 +47926,7 @@
         <translation>Drücken, um die ausgewählten Attribute zu löschen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
         <source>Remove Attributes</source>
         <translation>Attribute löschen</translation>
     </message>
@@ -49445,7 +49445,7 @@
 <context>
     <name>SendRefererWhitelistDialog</name>
     <message>
-        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
         <source>Send Referer Whitelist</source>
         <translation>Referer Whitelist</translation>
     </message>
@@ -50657,7 +50657,7 @@
         <translation>&amp;Vorschau kopieren</translation>
     </message>
     <message>
-        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
+        <location filename="../Snapshot/SnapWidget.py" line="531"/>
         <source>eric6 Snapshot</source>
         <translation>eric6-Bildschirmfoto</translation>
     </message>
@@ -53262,7 +53262,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
         <source>Subversion Diff</source>
         <translation>Subversion-Diff</translation>
     </message>
@@ -53540,12 +53540,12 @@
         <translation>Subversion-Log</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/>
         <source>Revision</source>
         <translation>Revision</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
@@ -53555,7 +53555,7 @@
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
@@ -53906,7 +53906,7 @@
         <translation>&amp;Protokoll:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL:</translation>
     </message>
@@ -54007,7 +54007,7 @@
         <translation>Wähle das Protokoll zum Zugriff auf das Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL:</translation>
     </message>
@@ -55252,7 +55252,7 @@
         <translation>ignoriert</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
         <source>Subversion Status</source>
         <translation>Subversion-Status</translation>
     </message>
@@ -55262,7 +55262,7 @@
         <translation>Änderungen einpflegen...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
         <source>Commit</source>
         <translation>Einpflegen</translation>
     </message>
@@ -60696,7 +60696,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation>Modultest</translation>
     </message>
@@ -63583,9 +63583,9 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
         <translation>&lt;b&gt;Globale Filterliste&lt;/b&gt;
-&lt;p&gt;Wähle die Variablentypen die aus der globalen Variablenliste ausgefiltert werden sollen.&lt;/p&gt;</translation>
+&lt;p&gt;Wähle die Variablentypen aus, die im Betrachter für globale Variablen angezeigt werden sollen.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/>
@@ -63595,25 +63595,30 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
         <translation>&lt;b&gt;Lokale Filterliste&lt;/b&gt;
-&lt;p&gt;Wähle die Variablentypen die aus der lokalen Variablenliste ausgefiltert werden sollen.&lt;/p&gt;</translation>
+&lt;p&gt;Wähle die Variablentypen aus, die im Betrachter für lokale Variablen angezeigt werden sollen.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>&amp;Globale Filter</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation>&amp;Globale Variablen</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>&amp;Lokale Filter</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation>&amp;Lokale Variablen</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.py" line="42"/>
         <source>Save Default</source>
         <translation>Standard speichern</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation>Wähle die Variablentypen aus, die in den Variablen Betrachter angezeigt werden sollen:</translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_empty.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_empty.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -14420,54 +14420,54 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -63010,12 +63010,12 @@
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
+        <source>&amp;Locals Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
+        <source>&amp;Globals Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -63026,7 +63026,7 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -63037,7 +63037,7 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -63045,6 +63045,11 @@
         <source>Save Default</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_en.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_en.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -14434,54 +14434,54 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -63051,12 +63051,12 @@
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
+        <source>&amp;Locals Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
+        <source>&amp;Globals Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -63067,7 +63067,7 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -63078,7 +63078,7 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -63086,6 +63086,11 @@
         <source>Save Default</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_es.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_es.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -14529,54 +14529,54 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>Filtro de excepciones</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Filtro de excepciones&lt;/b&gt;&lt;p&gt;Este diálogo se utiliza para introducir los tipos de excepción que deben ser resaltados durante una sesión de depuración. Si la lista esta vacía, todos los tipos de excepción serán resaltados. Si el flag de reportar excepciones en el diálogo &apos;Comenzar depuración&apos; no está marcado, no se reportará ninguna excepción.&lt;/p&gt;&lt;p&gt;Note por favor que las excepciones no controlads siempre son resaltadas, independientemente de las opciones de configuración.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation>Pulse para borrar la excepción seleccionada de la lista</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation>Introduzca un tipo de excepción que debe ser resaltado</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation>Lista de excepciones que serán resaltadas</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation>Pulse para añadir la excepción introducida a la lista</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation>Pulse para borrar todas las excepciones de la lista</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>Borrar todas</translation>
     </message>
@@ -63526,13 +63526,13 @@
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>&amp;Filtro de Locales</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation type="unfinished">&amp;Filtro de Locales</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>&amp;Filtro de Globales</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation type="unfinished">&amp;Filtro de Globales</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/>
@@ -63542,8 +63542,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Lista de Filtros para Locales&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Lista de Filtros para Locales&lt;/b&gt;
 &lt;p&gt;Seleccione de esta lista los tipos de variables locales que desea filtrar.&lt;/p&gt;</translation>
     </message>
     <message>
@@ -63554,8 +63554,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Lista de Filtros para Globales&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Lista de Filtros para Globales&lt;/b&gt;
 &lt;p&gt;Seleccione de esta lista los tipos de variables globales que desea filtrar.&lt;/p&gt;</translation>
     </message>
     <message>
@@ -63563,6 +63563,11 @@
         <source>Save Default</source>
         <translation>Guardar como &apos;por defecto&apos;</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_fr.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_fr.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -14936,7 +14936,7 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
@@ -14945,47 +14945,47 @@
 &lt;p&gt;Noter que les exceptions inexpliquées seront toujours signalées indépendamment de ces réglages.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation>Entrer un type d&apos;exception à surligner</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation>Liste des exceptions qui doivent être surlignées</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation>Cliquer pour ajouter l&apos;exception à la liste</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation>Cliquer pour supprimer l&apos;exception sélectionnée de la liste</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>Filtre d&apos;exceptions</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation>Cliquer pour supprimer toutes les exceptions de la liste</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>Tous supprimer</translation>
     </message>
@@ -64545,8 +64545,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Liste des filtres de variables globales&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Liste des filtres de variables globales&lt;/b&gt;
 &lt;p&gt;Sélectionnez les types de variables que vous souhaitez filtrer dans la liste des variables globales.&lt;/p&lt;</translation>
     </message>
     <message>
@@ -64557,25 +64557,30 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Liste des filtres de variables locales&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Liste des filtres de variables locales&lt;/b&gt;
 &lt;p&gt;Sélectionnez les types de variables que vous souhaitez filtrer dans la liste des variables locales.&lt;/p&lt;</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>Filtre de variables &amp;globales</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation type="unfinished">Filtre de variables &amp;globales</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>Filtre de variables &amp;locales</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation type="unfinished">Filtre de variables &amp;locales</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.py" line="42"/>
         <source>Save Default</source>
         <translation>Enregistrer par défaut</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_it.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_it.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -15077,7 +15077,7 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
@@ -15086,47 +15086,47 @@
 &lt;p&gt;Nota che tutte le eccezioni non gestite sono sempre evidenziate indipendentemente da queste impostazioni.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation>Inserisci un tipo di eccezione che deve essere evidenziata</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation>Lista di eccezioni che devono essere evidenziate</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation>Premi per aggiungere l&apos;eccezione inserita alla lista</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation>Premi per cancellare l&apos;eccezione selezionata dalla lista</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>Filtro eccezioni</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation>Premi per cancellare tutte le eccezioni dalla lista</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>Cancella tutto</translation>
     </message>
@@ -65061,8 +65061,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Lista filtri globali&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Lista filtri globali&lt;/b&gt;
 &lt;p&gt;Seleziona il tipo di variabile che vuoi sia esclusa dalla lista delle variabili globali.&lt;/p&gt;</translation>
     </message>
     <message>
@@ -65073,25 +65073,30 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Lista filtri locali&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Lista filtri locali&lt;/b&gt;
 &lt;p&gt;Seleziona il tipo di variabile che vuoi sia esclusa dalla lista delle variabili locali.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>Filtri &amp;Globali</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation type="unfinished">Filtri &amp;Globali</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>Filtri &amp;Locali</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation type="unfinished">Filtri &amp;Locali</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.py" line="42"/>
         <source>Save Default</source>
         <translation>Salva default</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_pt.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_pt.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -15049,12 +15049,12 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>Filtro de Exceções</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
@@ -15063,42 +15063,42 @@
 &lt;p&gt;Por favor note-se que as exceções sem tratar sempre serão ressaltadas, independentemente das definições.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation>Lista de exceções que deverão ser ressaltadas</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation>Pressionar para adicionar à lista a exceção introduzida</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation>Introduzir um tipo de exceção que deva ser ressaltada</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation>Pressionar para apagar a exceção marcada da lista</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation>Pressionar para apagar todas as exceções da lista</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>Apagar Tudo</translation>
     </message>
@@ -64762,13 +64762,13 @@
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>Filtro de &amp;Locais</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation type="unfinished">Filtro de &amp;Locais</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>Filtro de &amp;Globais</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation type="unfinished">Filtro de &amp;Globais</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/>
@@ -64778,7 +64778,7 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -64789,7 +64789,7 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -64797,6 +64797,11 @@
         <source>Save Default</source>
         <translation>Gravar Padrão</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_ru.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_ru.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -390,7 +390,7 @@
 <context>
     <name>AddBookmarkDialog</name>
     <message>
-        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
+        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
         <source>Add Bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
@@ -1700,7 +1700,7 @@
         <translation>Удалить выбранные элементы</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
@@ -2423,12 +2423,12 @@
         <translation>Сохранить трассировку вызовов как текстовый файл</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation>До</translation>
     </message>
@@ -2536,7 +2536,7 @@
         <translation>Очистить список хостов</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
@@ -2894,7 +2894,7 @@
 <context>
     <name>ClickToFlashWhitelistDialog</name>
     <message>
-        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
+        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
         <source>ClickToFlash Whitelist</source>
         <translation>Белый список ClickToFlash</translation>
     </message>
@@ -4826,7 +4826,7 @@
         <translation>Домен:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation>&lt;куки не выбраны&gt;</translation>
     </message>
@@ -7417,7 +7417,7 @@
 <context>
     <name>DownloadManager</name>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
         <source>Downloads</source>
         <translation>Загрузки</translation>
     </message>
@@ -7881,92 +7881,92 @@
         <translation>Стандартные кнопки</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
         <source>Abort</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
         <source>Discard</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
         <source>No to all</source>
         <translation>Нет для всех</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
         <source>Restore defaults</source>
         <translation>Восстановить умолчания</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
         <source>Retry</source>
         <translation>Повтор</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
         <source>Save all</source>
         <translation>Сохранить всё</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
         <source>Yes to all</source>
         <translation>Да для всех</translation>
     </message>
@@ -9985,7 +9985,7 @@
         <translation>Выбор API-файла  из списка установленных файлов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/>
         <source>Add from installed APIs</source>
         <translation>Добавить из списка установленных файлов API</translation>
     </message>
@@ -9995,7 +9995,7 @@
         <translation>Выбор API-файла из списка API-файлов установленных плагинов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/>
         <source>Add from Plugin APIs</source>
         <translation>Добавить из списка файлов API, установленных с помощью плагинов</translation>
     </message>
@@ -10005,7 +10005,7 @@
         <translation>Компиляция выбранных определений API</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/>
         <source>Compile APIs</source>
         <translation>Компилировать API</translation>
     </message>
@@ -11143,7 +11143,7 @@
         <translation>Выберите шрифт.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
@@ -11153,7 +11153,7 @@
         <translation>Разрешить заливку фона до конца строки.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/>
         <source>Fill to end of line</source>
         <translation>Заливка до конца строки</translation>
     </message>
@@ -12695,7 +12695,7 @@
         <translation>Режим:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>Отключена</translation>
     </message>
@@ -13414,7 +13414,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.ui" line="13"/>
+        <location filename="../UI/EmailDialog.py" line="346"/>
         <source>Send bug report</source>
         <translation>Отправить сообщение об ошибке</translation>
     </message>
@@ -14575,12 +14575,12 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>Фильтр исключений</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
@@ -14589,42 +14589,42 @@
 &lt;p&gt;Пожалуйста учтите, что необработанные исключения всегда перехватываются отладчиком, вне зависимости от настроек.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation>Список исключений для перехвата</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation>Добавить исключения в список</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation>Задайте тип исключения для перехвата</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation>Удалить исключения из списка</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation>Удалить все исключения из списка</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>Удалить все</translation>
     </message>
@@ -14844,12 +14844,12 @@
         <translation>Уведомления</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
         <source>Host</source>
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
         <source>Permission</source>
         <translation>Разрешение</translation>
     </message>
@@ -14864,7 +14864,7 @@
         <translation>Удалить все</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
         <source>Geolocation</source>
         <translation>Геолокация</translation>
     </message>
@@ -15991,7 +15991,7 @@
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation>&lt;нет выделенных флэш-куки&gt;</translation>
     </message>
@@ -16001,7 +16001,7 @@
         <translation>Размер:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
         <source>Origin:</source>
         <translation>Источник:</translation>
     </message>
@@ -16036,7 +16036,7 @@
         <translation>Удалить выбранные флэш-куки</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
         <source>Remove Cookie</source>
         <translation>Удалить куки</translation>
     </message>
@@ -16465,7 +16465,7 @@
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
     <message>
-        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
+        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
         <source>GreaseMonkey Script Installation</source>
         <translation>Инсталляция GreaseMonkey скрипта</translation>
     </message>
@@ -22073,7 +22073,7 @@
 <context>
     <name>HgAddSubrepositoryDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
         <source>Add Sub-repository</source>
         <translation>Добавить субрепозиторий</translation>
     </message>
@@ -23254,7 +23254,7 @@
         <translation>Пометить выбранные конфликты как &apos;разрешенные&apos;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
         <source>Resolved</source>
         <translation>Разрешённые</translation>
     </message>
@@ -23264,7 +23264,7 @@
         <translation>Пометить выбранные конфликты как &apos;неразрешенные&apos;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
         <source>Unresolved</source>
         <translation>Неразрешённые</translation>
     </message>
@@ -23857,7 +23857,7 @@
         <translation>Задайте поле, по которому фильтровать</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
         <source>Revision</source>
         <translation>Ревизия</translation>
     </message>
@@ -24230,7 +24230,7 @@
         <translation>&lt;p&gt;Невозможно прочитать файл &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>Edit Plan</source>
         <translation>Изменение плана</translation>
     </message>
@@ -24371,7 +24371,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/>
         <source>Mercurial Log</source>
         <translation>Mercurial: Журнал</translation>
     </message>
@@ -24411,17 +24411,17 @@
         <translation>Задайте поле, по которому фильтровать</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/>
         <source>Revision</source>
         <translation>Ревизия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
@@ -28139,7 +28139,7 @@
 <context>
     <name>HgStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
         <source>Mercurial Status</source>
         <translation>Mercurial: Статус </translation>
     </message>
@@ -28281,7 +28281,7 @@
         <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
         <source>Commit</source>
         <translation>Фиксация</translation>
     </message>
@@ -28401,7 +28401,7 @@
         <translation>все</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
         <source>Differences</source>
         <translation>Различия</translation>
     </message>
@@ -29677,7 +29677,7 @@
         <translation>Удалить выбранные записи</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation>&amp;Удалить</translation>
     </message>
@@ -35829,92 +35829,92 @@
         <translation>Стандартные кнопки</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
         <source>Abort</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
         <source>Save all</source>
         <translation>Сохранить всё</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
         <source>Discard</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
         <source>Yes to all</source>
         <translation>Да для всех</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
         <source>No to all</source>
         <translation>Нет для всех</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
         <source>Retry</source>
         <translation>Повтор</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
         <source>Restore defaults</source>
         <translation>Восстановить умолчания</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -37626,7 +37626,7 @@
 <context>
     <name>NoCacheHostsDialog</name>
     <message>
-        <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
+        <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
         <source>Not Cached Hosts</source>
         <translation>Некэшированные хосты</translation>
     </message>
@@ -37734,7 +37734,7 @@
         <translation>Задать координаты визуально</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
         <source>Visual Selection</source>
         <translation>Визуальный выбор</translation>
     </message>
@@ -38407,7 +38407,7 @@
 <context>
     <name>PasswordsDialog</name>
     <message>
-        <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
         <source>Saved Passwords</source>
         <translation>Сохранённые пароли</translation>
     </message>
@@ -43200,7 +43200,7 @@
         <translation>Выполнено</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation>Охват</translation>
     </message>
@@ -43281,7 +43281,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
         <source>%v/%m Files</source>
         <translation>%v из %m файлов</translation>
     </message>
@@ -43289,7 +43289,7 @@
 <context>
     <name>PyProfileDialog</name>
     <message>
-        <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
+        <location filename="../DataViews/PyProfileDialog.py" line="233"/>
         <source>Profile Results</source>
         <translation>Результаты профайлера</translation>
     </message>
@@ -48066,7 +48066,7 @@
         <translation>Удалить выделенные фильтры</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
         <source>Remove Filters</source>
         <translation>Удалить фильтры</translation>
     </message>
@@ -48076,7 +48076,7 @@
         <translation>Удалить выбранные атрибуты</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
         <source>Remove Attributes</source>
         <translation>Удалить атрибуты</translation>
     </message>
@@ -49604,7 +49604,7 @@
 <context>
     <name>SendRefererWhitelistDialog</name>
     <message>
-        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
         <source>Send Referer Whitelist</source>
         <translation>Отправить реферер белого списка</translation>
     </message>
@@ -50819,7 +50819,7 @@
         <translation>К&amp;опировать превью</translation>
     </message>
     <message>
-        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
+        <location filename="../Snapshot/SnapWidget.py" line="531"/>
         <source>eric6 Snapshot</source>
         <translation>Снимки eric6</translation>
     </message>
@@ -53422,7 +53422,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
         <source>Subversion Diff</source>
         <translation>Subversion: Отображение различий</translation>
     </message>
@@ -53725,17 +53725,17 @@
         <translation>Выберите поле, по которому фильтровать</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/>
         <source>Revision</source>
         <translation>Ревизия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
@@ -54071,7 +54071,7 @@
         <translation>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Задайте URL модуля. Репозиторий со стандартной раскладкой не должен содержать части trunk, tags или branches.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL репозитория:</translation>
     </message>
@@ -54166,7 +54166,7 @@
         <translation>Задайте протокол доступа к репозиторию</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL репозитория:</translation>
     </message>
@@ -55351,7 +55351,7 @@
 <context>
     <name>SvnStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
         <source>Subversion Status</source>
         <translation>Subversion: Статус</translation>
     </message>
@@ -55628,7 +55628,7 @@
         <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
         <source>Commit</source>
         <translation>Фиксация</translation>
     </message>
@@ -60860,7 +60860,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation>Unittest</translation>
     </message>
@@ -63762,13 +63762,13 @@
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>Фильтр &amp;локальных переменных</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation type="unfinished">Фильтр &amp;локальных переменных</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>Фильтр &amp;глобальных переменных</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation type="unfinished">Фильтр &amp;глобальных переменных</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/>
@@ -63778,8 +63778,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Фильтр локальных переменных&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Фильтр локальных переменных&lt;/b&gt;
 &lt;p&gt;Выберите, какие переменные не будут отображены в списке локальных переменных.&lt;/p&gt;</translation>
     </message>
     <message>
@@ -63790,8 +63790,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;Фильтр глобальных переменных&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;Фильтр глобальных переменных&lt;/b&gt;
 &lt;p&gt;Выберите, какие переменные не будут отображены в списке глобальных переменных.&lt;/p&gt;</translation>
     </message>
     <message>
@@ -63799,6 +63799,11 @@
         <source>Save Default</source>
         <translation>Сохранить как умолчание</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_tr.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_tr.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -14909,12 +14909,12 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>İstisnai Süzgeç</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
@@ -14923,42 +14923,42 @@
 &lt;p&gt;Lütfen not ediniz, yürütülmeyen istisnalar burdaki ayarlardan bağımsız olarak işaretlenmiştir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>Ekle</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>Hepsini Sil</translation>
     </message>
@@ -64353,13 +64353,13 @@
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>Yere&amp;l Süzgeçler</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation type="unfinished">Yere&amp;l Süzgeçler</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>Küresel Süz&amp;geçler</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation type="unfinished">Küresel Süz&amp;geçler</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/>
@@ -64369,7 +64369,7 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -64380,7 +64380,7 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -64388,6 +64388,11 @@
         <source>Save Default</source>
         <translation>Öntanımlı Olarak Kaydet</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
--- a/i18n/eric6_zh_CN.ts	Tue Jan 31 18:33:52 2017 +0100
+++ b/i18n/eric6_zh_CN.ts	Tue Jan 31 18:43:09 2017 +0100
@@ -14932,12 +14932,12 @@
 <context>
     <name>ExceptionsFilterDialog</name>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/>
         <source>Exceptions Filter</source>
         <translation>异常过滤器</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/>
         <source>&lt;b&gt;Exception Filter&lt;/b&gt;
 &lt;p&gt;This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the &quot;Start Debugging&quot; dialog is unchecked, no exception will be reported at all.&lt;/p&gt;
 &lt;p&gt;Please note, that unhandled exceptions are always highlighted independent of these settings.&lt;/p&gt;</source>
@@ -14945,42 +14945,42 @@
 &lt;p&gt;该对话框用于输入在调试会话期间将被高亮显示的异常类型。如果该列表为空，则所有异常类型都将被高亮显示。如果在“开始调试”对话框中的排除报告标志未被选中，则根本不会报告任何异常。&lt;/p&gt;&lt;p&gt;请注意，未处理的异常总是被高亮显示，不管如何设置。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/>
         <source>List of exceptions that shall be highlighted</source>
         <translation>要高亮显示的异常列表</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/>
         <source>Press to add the entered exception to the list</source>
         <translation>点击添加输入的异常到列表中</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/>
         <source>Enter an exception type that shall be highlighted</source>
         <translation>输入要被高亮显示的异常类型</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/>
         <source>Press to delete the selected exception from the list</source>
         <translation>点击从列表中删除已选异常</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/>
         <source>Press to delete all exceptions from the list</source>
         <translation>点击从列表中删除所有异常</translation>
     </message>
     <message>
-        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/>
+        <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/>
         <source>Delete All</source>
         <translation>全部删除</translation>
     </message>
@@ -64567,13 +64567,13 @@
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/>
-        <source>&amp;Locals Filter</source>
-        <translation>局部过滤(&amp;L)</translation>
+        <source>&amp;Locals Viewer</source>
+        <translation type="unfinished">局部过滤(&amp;L)</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/>
-        <source>&amp;Globals Filter</source>
-        <translation>全局过滤(&amp;G)</translation>
+        <source>&amp;Globals Viewer</source>
+        <translation type="unfinished">全局过滤(&amp;G)</translation>
     </message>
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/>
@@ -64583,8 +64583,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/>
         <source>&lt;b&gt;Locals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the locals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;局部过滤列表&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the local variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;局部过滤列表&lt;/b&gt;
 &lt;p&gt;选择想要从局部变量列表中过滤的变量类型。&lt;/p&gt;</translation>
     </message>
     <message>
@@ -64595,8 +64595,8 @@
     <message>
         <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/>
         <source>&lt;b&gt;Globals Filter List&lt;/b&gt;
-&lt;p&gt;Select the variable types you want to be filtered out of the globals variables list.&lt;/p&lt;</source>
-        <translation>&lt;b&gt;全局过滤列表&lt;/b&gt;
+&lt;p&gt;Select the variable types you want to be shown in the global variables viewer.&lt;/p&lt;</source>
+        <translation type="unfinished">&lt;b&gt;全局过滤列表&lt;/b&gt;
 &lt;p&gt;选择想要从全部变量列表中过滤的变量类型。&lt;/p&gt;</translation>
     </message>
     <message>
@@ -64604,6 +64604,11 @@
         <source>Save Default</source>
         <translation>保存默认值</translation>
     </message>
+    <message>
+        <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/>
+        <source>Select the variable types to be shown in the variables viewers:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VariablesViewer</name>
Debugger/ExceptionsFilterDialog.ui		file \| annotate \| diff \| comparison \| revisions
Debugger/VariablesFilterDialog.py		file \| annotate \| diff \| comparison \| revisions
Debugger/VariablesFilterDialog.ui		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