eric: changeset 4097:ad2a6bd965d9

--- a/APIs/Python3/eric6.api	Sat Feb 07 11:35:39 2015 +0100
+++ b/APIs/Python3/eric6.api	Sat Feb 07 12:38:32 2015 +0100
@@ -6172,7 +6172,7 @@
 eric6.Preferences.ConfigurationPages.IrcPage.IrcPage?1()
 eric6.Preferences.ConfigurationPages.IrcPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.LogViewerPage.LogViewerPage.save?4()
-eric6.Preferences.ConfigurationPages.LogViewerPage.LogViewerPage?1()
+eric6.Preferences.ConfigurationPages.LogViewerPage.LogViewerPage?1(parent=None)
 eric6.Preferences.ConfigurationPages.LogViewerPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.getCurrentPassword?4()
 eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.getMasterPassword?4()
@@ -6180,6 +6180,10 @@
 eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.on_newPasswordAgainEdit_textChanged?4(txt)
 eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.on_newPasswordEdit_textChanged?4(txt)
 eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog?1(oldPasswordHash, parent=None)
+eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage.on_resetButton_clicked?4()
+eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage.save?4()
+eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.MimeTypesPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage.on_workspaceButton_clicked?4()
 eric6.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage.save?4()
 eric6.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage?1()
@@ -8476,7 +8480,6 @@
 eric6.Utilities.FtpUtilities.FtpDirLineParser.WindowsMode?7
 eric6.Utilities.FtpUtilities.FtpDirLineParser.parseLine?4(line)
 eric6.Utilities.FtpUtilities.FtpDirLineParser?1(parent=None)
-eric6.Utilities.MimeTypes.TextMimeTypes?7
 eric6.Utilities.MimeTypes.isTextFile?4(filename)
 eric6.Utilities.ModuleParser.Attribute.addAssignment?4(lineno)
 eric6.Utilities.ModuleParser.Attribute?1(module, name, file, lineno, isSignal=False)
--- a/APIs/Python3/eric6.bas	Sat Feb 07 11:35:39 2015 +0100
+++ b/APIs/Python3/eric6.bas	Sat Feb 07 12:38:32 2015 +0100
@@ -444,6 +444,7 @@
 MercurialPage ConfigurationPageBase Ui_MercurialPage
 MessageBoxWizard QObject
 MessageBoxWizardDialog QDialog Ui_MessageBoxWizardDialog
+MimeTypesPage ConfigurationPageBase Ui_MimeTypesPage
 MiniEditor E5MainWindow
 MiniScintilla QsciScintillaCompat
 Module ClbrBaseClasses.Module VisibilityMixin
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sat Feb 07 11:35:39 2015 +0100
+++ b/Documentation/Help/source.qhp	Sat Feb 07 12:38:32 2015 +0100
@@ -776,6 +776,7 @@
               <section title="eric6.Preferences.ConfigurationPages.IrcPage" ref="eric6.Preferences.ConfigurationPages.IrcPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.LogViewerPage" ref="eric6.Preferences.ConfigurationPages.LogViewerPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html" />
+              <section title="eric6.Preferences.ConfigurationPages.MimeTypesPage" ref="eric6.Preferences.ConfigurationPages.MimeTypesPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.MultiProjectPage" ref="eric6.Preferences.ConfigurationPages.MultiProjectPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.NetworkPage" ref="eric6.Preferences.ConfigurationPages.NetworkPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.NotificationsPage" ref="eric6.Preferences.ConfigurationPages.NotificationsPage.html" />
@@ -7736,6 +7737,11 @@
       <keyword name="MessageBoxWizardDialog.on_rAboutQt_toggled" id="MessageBoxWizardDialog.on_rAboutQt_toggled" ref="eric6.Plugins.WizardPlugins.MessageBoxWizard.MessageBoxWizardDialog.html#MessageBoxWizardDialog.on_rAboutQt_toggled" />
       <keyword name="MessageBoxWizardDialog.on_rAbout_toggled" id="MessageBoxWizardDialog.on_rAbout_toggled" ref="eric6.Plugins.WizardPlugins.MessageBoxWizard.MessageBoxWizardDialog.html#MessageBoxWizardDialog.on_rAbout_toggled" />
       <keyword name="MimeTypes (Module)" id="MimeTypes (Module)" ref="eric6.Utilities.MimeTypes.html" />
+      <keyword name="MimeTypesPage" id="MimeTypesPage" ref="eric6.Preferences.ConfigurationPages.MimeTypesPage.html#MimeTypesPage" />
+      <keyword name="MimeTypesPage (Constructor)" id="MimeTypesPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.MimeTypesPage.html#MimeTypesPage.__init__" />
+      <keyword name="MimeTypesPage (Module)" id="MimeTypesPage (Module)" ref="eric6.Preferences.ConfigurationPages.MimeTypesPage.html" />
+      <keyword name="MimeTypesPage.on_resetButton_clicked" id="MimeTypesPage.on_resetButton_clicked" ref="eric6.Preferences.ConfigurationPages.MimeTypesPage.html#MimeTypesPage.on_resetButton_clicked" />
+      <keyword name="MimeTypesPage.save" id="MimeTypesPage.save" ref="eric6.Preferences.ConfigurationPages.MimeTypesPage.html#MimeTypesPage.save" />
       <keyword name="MiniEditor" id="MiniEditor" ref="eric6.QScintilla.MiniEditor.html#MiniEditor" />
       <keyword name="MiniEditor (Constructor)" id="MiniEditor (Constructor)" ref="eric6.QScintilla.MiniEditor.html#MiniEditor.__init__" />
       <keyword name="MiniEditor (Module)" id="MiniEditor (Module)" ref="eric6.QScintilla.MiniEditor.html" />
@@ -13030,6 +13036,7 @@
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.InterfacePage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.IrcPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.LogViewerPage.html#create" />
+      <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.MimeTypesPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.MultiProjectPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.NetworkPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.NotificationsPage.html#create" />
@@ -14203,6 +14210,7 @@
       <file>eric6.Preferences.ConfigurationPages.IrcPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.LogViewerPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html</file>
+      <file>eric6.Preferences.ConfigurationPages.MimeTypesPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.MultiProjectPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.NetworkPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.NotificationsPage.html</file>
--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.LogViewerPage.html	Sat Feb 07 11:35:39 2015 +0100
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.LogViewerPage.html	Sat Feb 07 12:38:32 2015 +0100
@@ -73,7 +73,7 @@
 </table>
 <a NAME="LogViewerPage.__init__" ID="LogViewerPage.__init__"></a>
 <h4>LogViewerPage (Constructor)</h4>
-<b>LogViewerPage</b>(<i></i>)
+<b>LogViewerPage</b>(<i>parent=None</i>)
 <p>
         Constructor
 </p><dl>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.MimeTypesPage.html	Sat Feb 07 12:38:32 2015 +0100
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Preferences.ConfigurationPages.MimeTypesPage</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Preferences.ConfigurationPages.MimeTypesPage</h1>
+<p>
+Module implementing the Text Mime Types configuration page.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#MimeTypesPage">MimeTypesPage</a></td>
+<td>Class implementing the Text Mime Types configuration page.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#create">create</a></td>
+<td>Module function to create the configuration page.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="MimeTypesPage" ID="MimeTypesPage"></a>
+<h2>MimeTypesPage</h2>
+<p>
+    Class implementing the Text Mime Types configuration page.
+</p>
+<h3>Derived from</h3>
+ConfigurationPageBase, Ui_MimeTypesPage
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#MimeTypesPage.__init__">MimeTypesPage</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#MimeTypesPage.on_resetButton_clicked">on_resetButton_clicked</a></td>
+<td>Private slot to set the default list of mime types.</td>
+</tr><tr>
+<td><a href="#MimeTypesPage.save">save</a></td>
+<td>Public slot to save the Interface configuration.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="MimeTypesPage.__init__" ID="MimeTypesPage.__init__"></a>
+<h4>MimeTypesPage (Constructor)</h4>
+<b>MimeTypesPage</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i></dt>
+<dd>
+reference to the parent widget (QWidget)
+</dd>
+</dl><a NAME="MimeTypesPage.on_resetButton_clicked" ID="MimeTypesPage.on_resetButton_clicked"></a>
+<h4>MimeTypesPage.on_resetButton_clicked</h4>
+<b>on_resetButton_clicked</b>(<i></i>)
+<p>
+        Private slot to set the default list of mime types.
+</p><a NAME="MimeTypesPage.save" ID="MimeTypesPage.save"></a>
+<h4>MimeTypesPage.save</h4>
+<b>save</b>(<i></i>)
+<p>
+        Public slot to save the Interface configuration.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="create" ID="create"></a>
+<h2>create</h2>
+<b>create</b>(<i>dlg</i>)
+<p>
+    Module function to create the configuration page.
+</p><dl>
+<dt><i>dlg</i></dt>
+<dd>
+reference to the configuration dialog
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+reference to the instantiated page (ConfigurationPageBase)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.Utilities.MimeTypes.html	Sat Feb 07 11:35:39 2015 +0100
+++ b/Documentation/Source/eric6.Utilities.MimeTypes.html	Sat Feb 07 12:38:32 2015 +0100
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>TextMimeTypes</td></tr>
+<tr><td>None</td></tr>
 </table>
 <h3>Classes</h3>
 <table>
--- a/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html	Sat Feb 07 11:35:39 2015 +0100
+++ b/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html	Sat Feb 07 12:38:32 2015 +0100
@@ -145,6 +145,9 @@
 <td><a href="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html">MasterPasswordEntryDialog</a></td>
 <td>Module implementing a dialog to enter or change the master password.</td>
 </tr><tr>
+<td><a href="eric6.Preferences.ConfigurationPages.MimeTypesPage.html">MimeTypesPage</a></td>
+<td>Module implementing the Text Mime Types configuration page.</td>
+</tr><tr>
 <td><a href="eric6.Preferences.ConfigurationPages.MultiProjectPage.html">MultiProjectPage</a></td>
 <td>Module implementing the Multi Project configuration page.</td>
 </tr><tr>
--- a/Preferences/ConfigurationDialog.py	Sat Feb 07 11:35:39 2015 +0100
+++ b/Preferences/ConfigurationDialog.py	Sat Feb 07 12:38:32 2015 +0100
@@ -144,6 +144,9 @@
                 "logViewerPage":
                 [self.tr("Log-Viewer"), "preferences-logviewer.png",
                  "LogViewerPage", None, None],
+                "mimeTypesPage":
+                [self.tr("Mimetypes"), "preferences-mimetypes.png",
+                 "MimeTypesPage", None, None],
                 "networkPage":
                 [self.tr("Network"), "preferences-network.png",
                  "NetworkPage", None, None],
--- a/Preferences/ConfigurationPages/LogViewerPage.py	Sat Feb 07 11:35:39 2015 +0100
+++ b/Preferences/ConfigurationPages/LogViewerPage.py	Sat Feb 07 12:38:32 2015 +0100
@@ -19,7 +19,7 @@
     """
     Class implementing the Log Viewer configuration page.
     """
-    def __init__(self):
+    def __init__(self, parent=None):
         """
         Constructor
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Preferences/ConfigurationPages/MimeTypesPage.py	Sat Feb 07 12:38:32 2015 +0100
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2006 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing the Text Mime Types configuration page.
+"""
+
+from __future__ import unicode_literals
+
+from PyQt5.QtCore import pyqtSlot
+
+from E5Gui import E5MessageBox
+
+from .ConfigurationPageBase import ConfigurationPageBase
+from .Ui_MimeTypesPage import Ui_MimeTypesPage
+
+import Preferences
+
+
+class MimeTypesPage(ConfigurationPageBase, Ui_MimeTypesPage):
+    """
+    Class implementing the Text Mime Types configuration page.
+    """
+    def __init__(self, parent=None):
+        """
+        Constructor
+
+        @param parent reference to the parent widget (QWidget)
+        """
+        super(MimeTypesPage, self).__init__()
+        self.setupUi(self)
+        self.setObjectName("MimeTypesPage")
+
+        # set initial values
+        self.textMimeTypesList.setList(
+            Preferences.getUI("TextMimeTypes"))
+
+    def save(self):
+        """
+        Public slot to save the Interface configuration.
+        """
+        Preferences.setUI("TextMimeTypes", self.textMimeTypesList.getList())
+
+    @pyqtSlot()
+    def on_resetButton_clicked(self):
+        """
+        Private slot to set the default list of mime types.
+        """
+        ok = E5MessageBox.yesNo(
+            self,
+            self.tr("Reset Mime Types"),
+            self.tr("""Do you really want to reset the configured list of"""
+                    """ mime types?"""))
+        if ok:
+            self.textMimeTypesList.setList(
+                Preferences.Prefs.uiDefaults["TextMimeTypes"])
+
+
+def create(dlg):
+    """
+    Module function to create the configuration page.
+
+    @param dlg reference to the configuration dialog
+    @return reference to the instantiated page (ConfigurationPageBase)
+    """
+    page = MimeTypesPage()
+    return page
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Preferences/ConfigurationPages/MimeTypesPage.ui	Sat Feb 07 12:38:32 2015 +0100
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MimeTypesPage</class>
+ <widget class="QWidget" name="MimeTypesPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>480</width>
+    <height>515</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="headerLabel">
+     <property name="text">
+      <string>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line9">
+     <property name="frameShape">
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Files of the mime types configured below are opened in an eric editor (in addition to all 'text' mime types).</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="E5StringListEditWidget" name="textMimeTypesList" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::WheelFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="resetButton">
+     <property name="toolTip">
+      <string>Press to reset the list to default values</string>
+     </property>
+     <property name="text">
+      <string>Reset to Defaults</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>E5StringListEditWidget</class>
+   <extends>QWidget</extends>
+   <header>E5Gui/E5StringListEditWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--- a/Preferences/__init__.py	Sat Feb 07 11:35:39 2015 +0100
+++ b/Preferences/__init__.py	Sat Feb 07 12:38:32 2015 +0100
@@ -226,6 +226,110 @@
         "NotificationTimeout": 5,       # time in seconds the notification
                                         # is shown
         "NotificationPosition": QPoint(10, 10),
+        "TextMimeTypes": [
+            "application/bookmarks.xbel",
+            "application/x-xbel",
+            "application/opensearchdescription+xml",
+            "application/x-actionscript",
+            "application/x-actionscript3",
+            "application/x-awk",
+            "application/x-sh",
+            "application/x-shellscript",
+            "application/x-shell-session",
+            "application/x-dos-batch",
+            "application/x-befunge",
+            "application/x-brainfuck",
+            "application/x-javascript+cheetah",
+            "application/x-javascript+spitfire",
+            "application/x-cheetah",
+            "application/x-spitfire",
+            "application/xml+cheetah",
+            "application/xml+spitfire",
+            "application/x-clojure",
+            "application/x-coldfusion",
+            "application/x-cython",
+            "application/x-django-templating",
+            "application/x-jinja",
+            "application/xml-dtd",
+            "application/x-ecl",
+            "application/x-ruby-templating",
+            "application/x-evoque",
+            "application/xml+evoque",
+            "application/x-fantom",
+            "application/x-genshi",
+            "application/x-kid",
+            "application/x-genshi-text",
+            "application/x-gettext",
+            "application/x-troff",
+            "application/xhtml+xml",
+            "application/x-php",
+            "application/x-httpd-php",
+            "application/x-httpd-php3",
+            "application/x-httpd-php4",
+            "application/x-httpd-php5",
+            "application/x-hybris",
+            "application/x-javascript+django",
+            "application/x-javascript+jinja",
+            "application/x-javascript+ruby",
+            "application/x-javascript+genshi",
+            "application/javascript",
+            "application/x-javascript",
+            "application/x-javascript+php",
+            "application/x-javascript+smarty",
+            "application/json",
+            "application/x-jsp",
+            "application/x-julia",
+            "application/x-httpd-lasso",
+            "application/x-httpd-lasso[89]",
+            "application/x-httpd-lasso8",
+            "application/x-httpd-lasso9",
+            "application/x-javascript+lasso",
+            "application/xml+lasso",
+            "application/x-lua",
+            "application/x-javascript+mako",
+            "application/x-mako",
+            "application/xml+mako",
+            "application/x-gooddata-maql",
+            "application/x-mason",
+            "application/x-moonscript",
+            "application/x-javascript+myghty",
+            "application/x-myghty",
+            "application/xml+myghty",
+            "application/x-newlisp",
+            "application/x-openedge",
+            "application/x-perl",
+            "application/postscript",
+            "application/x-pypylog",
+            "application/x-python3",
+            "application/x-python",
+            "application/x-qml",
+            "application/x-racket",
+            "application/x-pygments-tokens",
+            "application/x-ruby",
+            "application/x-standardml",
+            "application/x-scheme",
+            "application/x-sh-session",
+            "application/x-smarty",
+            "application/x-ssp",
+            "application/x-tcl",
+            "application/x-csh",
+            "application/x-urbiscript",
+            "application/xml+velocity",
+            "application/xquery",
+            "application/xml+django",
+            "application/xml+jinja",
+            "application/xml+ruby",
+            "application/xml",
+            "application/rss+xml",
+            "application/atom+xml",
+            "application/xml+php",
+            "application/xml+smarty",
+            "application/xsl+xml",
+            "application/xslt+xml",
+            "application/x-desktop",
+
+            "image/svg+xml",
+        ],
     }

     iconsDefaults = {
@@ -1558,7 +1662,7 @@
         else:
             return urls
     elif key in ["LogViewerStdoutFilter", "LogViewerStderrFilter",
-                 "LogViewerStdxxxFilter"]:
+                 "LogViewerStdxxxFilter", "TextMimeTypes"]:
         return toList(
             prefClass.settings.value("UI/" + key, prefClass.uiDefaults[key]))
     else:
--- a/Utilities/MimeTypes.py	Sat Feb 07 11:35:39 2015 +0100
+++ b/Utilities/MimeTypes.py	Sat Feb 07 12:38:32 2015 +0100
@@ -11,111 +11,7 @@

 import mimetypes

-# TODO: make this configurable
-TextMimeTypes = [
-    "application/bookmarks.xbel",
-    "application/x-xbel",
-    "application/opensearchdescription+xml",
-    "application/x-actionscript",
-    "application/x-actionscript3",
-    "application/x-awk",
-    "application/x-sh",
-    "application/x-shellscript",
-    "application/x-shell-session",
-    "application/x-dos-batch",
-    "application/x-befunge",
-    "application/x-brainfuck",
-    "application/x-javascript+cheetah",
-    "application/x-javascript+spitfire",
-    "application/x-cheetah",
-    "application/x-spitfire",
-    "application/xml+cheetah",
-    "application/xml+spitfire",
-    "application/x-clojure",
-    "application/x-coldfusion",
-    "application/x-cython",
-    "application/x-django-templating",
-    "application/x-jinja",
-    "application/xml-dtd",
-    "application/x-ecl",
-    "application/x-ruby-templating",
-    "application/x-evoque",
-    "application/xml+evoque",
-    "application/x-fantom",
-    "application/x-genshi",
-    "application/x-kid",
-    "application/x-genshi-text",
-    "application/x-gettext",
-    "application/x-troff",
-    "application/xhtml+xml",
-    "application/x-php",
-    "application/x-httpd-php",
-    "application/x-httpd-php3",
-    "application/x-httpd-php4",
-    "application/x-httpd-php5",
-    "application/x-hybris",
-    "application/x-javascript+django",
-    "application/x-javascript+jinja",
-    "application/x-javascript+ruby",
-    "application/x-javascript+genshi",
-    "application/javascript",
-    "application/x-javascript",
-    "application/x-javascript+php",
-    "application/x-javascript+smarty",
-    "application/json",
-    "application/x-jsp",
-    "application/x-julia",
-    "application/x-httpd-lasso",
-    "application/x-httpd-lasso[89]",
-    "application/x-httpd-lasso8",
-    "application/x-httpd-lasso9",
-    "application/x-javascript+lasso",
-    "application/xml+lasso",
-    "application/x-lua",
-    "application/x-javascript+mako",
-    "application/x-mako",
-    "application/xml+mako",
-    "application/x-gooddata-maql",
-    "application/x-mason",
-    "application/x-moonscript",
-    "application/x-javascript+myghty",
-    "application/x-myghty",
-    "application/xml+myghty",
-    "application/x-newlisp",
-    "application/x-openedge",
-    "application/x-perl",
-    "application/postscript",
-    "application/x-pypylog",
-    "application/x-python3",
-    "application/x-python",
-    "application/x-qml",
-    "application/x-racket",
-    "application/x-pygments-tokens",
-    "application/x-ruby",
-    "application/x-standardml",
-    "application/x-scheme",
-    "application/x-sh-session",
-    "application/x-smarty",
-    "application/x-ssp",
-    "application/x-tcl",
-    "application/x-csh",
-    "application/x-urbiscript",
-    "application/xml+velocity",
-    "application/xquery",
-    "application/xml+django",
-    "application/xml+jinja",
-    "application/xml+ruby",
-    "application/xml",
-    "application/rss+xml",
-    "application/atom+xml",
-    "application/xml+php",
-    "application/xml+smarty",
-    "application/xsl+xml",
-    "application/xslt+xml",
-    "application/x-desktop",
-
-    "image/svg+xml",
-]
+import Preferences


 def isTextFile(filename):
@@ -128,7 +24,7 @@
     type_ = mimetypes.guess_type(filename)[0]
     if (type_ is None or
         type_.split("/")[0] == "text" or
-            type_ in TextMimeTypes):
+            type_ in Preferences.getUI("TextMimeTypes")):
         return True
     else:
         return False
--- a/changelog	Sat Feb 07 11:35:39 2015 +0100
+++ b/changelog	Sat Feb 07 12:38:32 2015 +0100
@@ -2,6 +2,9 @@
 ----------
 Version 6.1-snapshot-2015mmdd:
 - bug fixes
+- General
+  -- added a configuration page to edit the list of mime types to
+     be opened in an eric editor
 - Log Viewer
   -- added a message filter including a configuration page
 - Previewers
--- a/eric6.e4p	Sat Feb 07 11:35:39 2015 +0100
+++ b/eric6.e4p	Sat Feb 07 12:38:32 2015 +0100
@@ -1153,6 +1153,7 @@
     <Source>E5Gui/E5TextEditSearchWidget.py</Source>
     <Source>E5Gui/E5StringListEditWidget.py</Source>
     <Source>Preferences/ConfigurationPages/LogViewerPage.py</Source>
+    <Source>Preferences/ConfigurationPages/MimeTypesPage.py</Source>
   </Sources>
   <Forms>
     <Form>PyUnit/UnittestDialog.ui</Form>
@@ -1485,6 +1486,7 @@
     <Form>E5Gui/E5TextEditSearchWidget.ui</Form>
     <Form>E5Gui/E5StringListEditWidget.ui</Form>
     <Form>Preferences/ConfigurationPages/LogViewerPage.ui</Form>
+    <Form>Preferences/ConfigurationPages/MimeTypesPage.ui</Form>
   </Forms>
   <Translations>
     <Translation>i18n/eric6_cs.qm</Translation>
--- a/i18n/eric6_cs.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_cs.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3943,213 +3943,213 @@
         <translation>Ikony</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>Plugin Manažer</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>Tiskárna</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>Úlohy</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>Úlohy</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>Šablony</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>Version Control Systems</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>Debugger</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Ruby</source>
         <translation>Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
+        <source>Editor</source>
+        <translation>Editor</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
         <source>Autocompletion</source>
         <translation>Autodoplňování</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Calltips</source>
         <translation>Rychlé tipy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>General</source>
         <translation>Hlavní</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>Psaní</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>Psaní</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>Exportery</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>Zvýrazňovače</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>Asociace typů souborů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>Styly</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>Dokumenty nápovědy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>Prohlížeče nápovědy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>Projekt</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
-        <source>Project Viewer</source>
-        <translation>Prohlížeč projektu</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>Projekt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
+        <source>Project Viewer</source>
+        <translation>Prohlížeč projektu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>Multiprojekt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>Viewmanager</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation>Chyba na straně konfigurace</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>Manažer souborů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
         <source>Searching</source>
         <translation>Vyhledávání</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
         <source>Appearance</source>
         <translation>Vzhled</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <source>Properties</source>
+        <translation>Nastavení</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
+        <source>Preferences</source>
+        <translation>Předvolby</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
+        <source>Please select an entry of the list
+to display the configuration page.</source>
+        <translation>Pro zobrazení strany s konfigurací vyberte položku ze seznamu.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <source>Network</source>
+        <translation>Síť</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
+        <source>Spell checking</source>
+        <translation>Kontrola pravopisu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <source>Python3</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
+        <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Konfigurační stranu &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
-        <source>Properties</source>
-        <translation>Nastavení</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
-        <source>Preferences</source>
-        <translation>Předvolby</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
-        <source>Please select an entry of the list
-to display the configuration page.</source>
-        <translation>Pro zobrazení strany s konfigurací vyberte položku ze seznamu.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
-        <source>Network</source>
-        <translation>Síť</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
-        <source>Spell checking</source>
-        <translation>Kontrola pravopisu</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
-        <source>Python3</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
-        <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Konfigurační stranu &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
         <source>Keywords</source>
         <translation>Klíčová slova</translation>
     </message>
@@ -4159,27 +4159,27 @@
         <translation>Spolupráce</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation type="unfinished">Bezpečnost</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4189,12 +4189,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished">eric5 web prohlížeč {6 ?}</translation>
     </message>
@@ -4203,6 +4203,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished">Prohlížeč logu</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31507,27 +31512,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation type="unfinished">Vyčistit</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation type="unfinished">Kopírovat</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation type="unfinished">Vybrat vše</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation type="unfinished">Konfigurovat...</translation>
     </message>
@@ -31580,17 +31585,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32130,6 +32135,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="373"/>
@@ -35408,27 +35446,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_de.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3951,214 +3951,214 @@
         <translation>Icons</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>Pluginmanager</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>Drucker</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>Aufgaben</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>Aufgaben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>Vorlagen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>Versionskontrollsysteme</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>Debugger</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Ruby</source>
         <translation>Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
+        <source>Editor</source>
+        <translation>Editor</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
         <source>Autocompletion</source>
         <translation>Automatische Vervollständigung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Calltips</source>
         <translation>Calltips</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>Eingabe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>Eingabe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>Exporter</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>Syntaxhervorhebung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>Dateitypzuordnungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>Stile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>Hilfe Dokumentation</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>Hilfeanzeiger</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>Projekt</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
-        <source>Project Viewer</source>
-        <translation>Projektanzeige</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>Projekt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
+        <source>Project Viewer</source>
+        <translation>Projektanzeige</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>Mehrfachprojekt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>Ansichtenmanager</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation>Konfigurationsseitenfehler</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Konfigurationsseite &lt;b&gt;{0}&lt;/b&gt; konnte nicht geladen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>Dateibehandlung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
         <source>Searching</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
         <source>Appearance</source>
         <translation>Erscheinung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
         <source>Properties</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation>Wähle einen Listeneintrag aus,
 um die Konfigurationsseite anzuzeigen.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
         <source>Spell checking</source>
         <translation>Rechtschreibprüfung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
         <source>Python3</source>
         <translation>Python 3</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
         <source>Keywords</source>
         <translation>Schlüsselwörter</translation>
     </message>
@@ -4168,27 +4168,27 @@
         <translation>Zusammenarbeit</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation>Systemstarter</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation>VirusTotal-Schnittstelle</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation>Filtertext …</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation>Benachrichtigungen</translation>
     </message>
@@ -4198,12 +4198,12 @@
         <translation>IRC</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation>Quelltextprüfungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation>eric6-Webbrowser</translation>
     </message>
@@ -4212,6 +4212,11 @@
         <source>Log-Viewer</source>
         <translation>Ausgabefenster</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation>MIME-Typen</translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31531,27 +31536,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation>Einstellungen...</translation>
     </message>
@@ -31604,17 +31609,17 @@
         <translation>Beide</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Meldungsfilter für Standardausgabe&lt;/b&gt;&lt;p&gt;Diese Liste zeigt alle konfigurierten Meldungsfilter zur Unterdrückung von Meldungen des Standardausgabekanals.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Meldungsfilter für Standardfehler&lt;/b&gt;&lt;p&gt;Diese Liste zeigt alle konfigurierten Meldungsfilter zur Unterdrückung von Meldungen des Standardfehlerkanals.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Meldungsfilter für beide&lt;/b&gt;&lt;p&gt;Diese Liste zeigt alle konfigurierten Meldungsfilter zur Unterdrückung von Meldungen des Standardausgabekanals oder des Standardfehlerkanals.&lt;/p&gt;</translation>
     </message>
@@ -32156,6 +32161,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation>&lt;b&gt;MIME-Typen Einstellungen&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation>Drücken, um die List auf Standardwerte zurückzusetzen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation>Auf Standard zurücksetzen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation>MIME-Typen zurücksetzen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation>Soll die Liste konfigurierter MIME-Typen wirklich auf Standardwerte zurückgesetzt werden?</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation>Dateien der unten configurierten MIME-Typen werden in einem eric Editor geöffnet (zusätzlich zu allen &apos;text&apos; MIME-Typen).</translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="373"/>
@@ -35441,27 +35479,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
--- a/i18n/eric6_en.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_en.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3912,238 +3912,238 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
-        <source>Python</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
-        <source>Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
-        <source>Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
-        <source>Version Control Systems</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Debugger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
-        <source>Python3</source>
+        <source>Python</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+        <source>Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
+        <source>Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
+        <source>Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
+        <source>Version Control Systems</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
+        <source>Debugger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <source>Python3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Ruby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
+        <source>Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
         <source>Autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>QScintilla</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>QScintilla</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
         <source>Calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
-        <source>Searching</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+        <source>Searching</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
         <source>Spell checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+        <source>Keywords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
-        <source>Appearance</source>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <source>Appearance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
         <source>Project Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4153,12 +4153,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4167,6 +4167,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31375,27 +31380,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31448,17 +31453,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31998,6 +32003,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="319"/>
@@ -35274,27 +35312,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_es.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3949,214 +3949,214 @@
         <translation>Iconos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>Gestor de Plugins</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>Impresora</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>Tareas</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>Tareas</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>Plantillas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>Sistemas de Control de Versiones</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>Depurador</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Ruby</source>
         <translation>Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
+        <source>Editor</source>
+        <translation>Editor</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
         <source>Autocompletion</source>
         <translation>Autocompletar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Calltips</source>
         <translation>Consejos de llamada (calltips)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>Tecleo de codigo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>Tecleo de codigo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>Exportadores</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>Resaltado de código</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>Asociación de tipos de archivo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>Estilos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>Documentación de Ayuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>Visores de Ayuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>Proyecto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
-        <source>Project Viewer</source>
-        <translation>Visor de proyecto</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>Proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
+        <source>Project Viewer</source>
+        <translation>Visor de proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>Multiproyecto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation>Interfaz de Usuario</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>Gestor de vistas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation> Error de Configuración de Página</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>Gestión de archivos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
         <source>Searching</source>
         <translation>Búsquedas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
         <source>Appearance</source>
         <translation>Apariencia</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation>Por favor, seleccione una entrada de la lista
 para visualizar la página de configuración.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
         <source>Spell checking</source>
         <translation>Corrección ortográfica</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
         <source>Python3</source>
         <translation>Python3</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La página de configuración  &lt;b&gt;{0}&lt;/b&gt; no puede ser cargada.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
         <source>Keywords</source>
         <translation>Palabras clave</translation>
     </message>
@@ -4166,27 +4166,27 @@
         <translation>Cooperación</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation>Lanzador de bandeja de sistema</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation>Interfaz de VirusTotal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation>Seguridad</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation>Introducir el texto de filtro...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation>Notificaciones</translation>
     </message>
@@ -4196,12 +4196,12 @@
         <translation>IRC</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation>Comprobadores de Código</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation>Navegador Web de eric6</translation>
     </message>
@@ -4210,6 +4210,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31608,27 +31613,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation>Seleccionar Todo</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation>Configurar...</translation>
     </message>
@@ -31681,17 +31686,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32233,6 +32238,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="373"/>
@@ -35517,27 +35555,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
--- a/i18n/eric6_fr.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_fr.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3937,214 +3937,214 @@
         <translation>Icônes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>Gestionnaire de plugins</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>Impression</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>Tâches</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>Tâches</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>Gabarits</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>Contrôle de versions</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>Débogueur</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Ruby</source>
         <translation>Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation>Éditeur</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
+        <source>Editor</source>
+        <translation>Éditeur</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
         <source>Autocompletion</source>
         <translation>Autocomplétion</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Calltips</source>
         <translation>Calltips</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>Autoformat</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>Autoformat</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>Exportation</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>Analyseurs syntaxiques</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>Types de fichiers</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>Styles</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>Sources de documentation</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>Visionneurs d&apos;aide</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>Projet</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
-        <source>Project Viewer</source>
-        <translation>Gestionnaire de projet</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>Projet</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
+        <source>Project Viewer</source>
+        <translation>Gestionnaire de projet</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>Multi-projet</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>Gestionnaire d&apos;affichage</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation>Erreur de la page de configuration</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>Gestion des fichiers</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
         <source>Searching</source>
         <translation>Recherche</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation>Choisir une entrée dans la liste
 pour afficher la page de configuration.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
         <source>Spell checking</source>
         <translation>Correction orthographique</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
         <source>Python3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
         <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4154,22 +4154,22 @@
         <translation type="unfinished">Coopération</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4179,17 +4179,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4198,6 +4198,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished">Fenêtre de log</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31525,27 +31530,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation type="unfinished">Effacer</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation type="unfinished">Copier</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation type="unfinished">Tout sélectionner</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation type="unfinished">Configuration...</translation>
     </message>
@@ -31598,17 +31603,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32148,6 +32153,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="373"/>
@@ -35425,27 +35463,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_it.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3949,214 +3949,214 @@
         <translation>Icone</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>Gestore plugin</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>Stampante</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>Task</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>Task</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>Modello</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>Controllo di versione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>Debugger</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Ruby</source>
         <translation>Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
+        <source>Editor</source>
+        <translation>Editor</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
         <source>Autocompletion</source>
         <translation>Autocompletamento</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Calltips</source>
         <translation>Calltips</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>Digitazione</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>Digitazione</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>Esportatori</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>Evidenziatori</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>Associazione tipi file</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>Stili</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>Aiuto Documentazione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>Aiuto visualizzatori</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>Progetto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
-        <source>Project Viewer</source>
-        <translation>Visualizzatore progetto</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>Progetto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
+        <source>Project Viewer</source>
+        <translation>Visualizzatore progetto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>Multiprogetto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation>Interfaccia</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>Gestrore viste</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation>Configurazione pagine errore</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>Gestione file</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
         <source>Searching</source>
         <translation>Ricerca</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
         <source>Appearance</source>
         <translation>Aspetto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>Stile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation>Selezionare un elemento della lista
 da mostrare nella pagina di configurazione.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
         <source>Network</source>
         <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
         <source>Spell checking</source>
         <translation>Correzione automatica</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
         <source>Python3</source>
         <translation>Python3</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La pagina di configurazione &lt;b&gt;{0}&lt;/b&gt; non può essere caricata.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
         <source>Keywords</source>
         <translation>Parole chiave</translation>
     </message>
@@ -4166,27 +4166,27 @@
         <translation>Cooperazione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation>Tray Starter</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation>Interfaccia VirusTotal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation>Insirisci il testo del filtro...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation>Notificazioni</translation>
     </message>
@@ -4196,12 +4196,12 @@
         <translation>IRC</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation>Correttori di codice</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished">Web Browser di eric5 {6 ?}</translation>
     </message>
@@ -4210,6 +4210,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished">Log-Viewer</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31589,27 +31594,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation>Pulisci</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation>Seleziona tutti</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation>Configura...</translation>
     </message>
@@ -31662,17 +31667,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32212,6 +32217,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="373"/>
@@ -35496,27 +35534,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_pt.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_pt.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -4205,229 +4205,229 @@
         <translation>Ícones</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
         <source>Network</source>
         <translation>Rede</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>Gestor de Plugins</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>Impressora</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>Tarefas</translation>
+        <source>Shell</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>Tarefas</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>Modelos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>Sistemas de Control de Versão</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>Depurador</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
-        <source>Python3</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <source>Python3</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Ruby</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
+        <source>Editor</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
         <source>Autocompletion</source>
         <translation>Autocompletar</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>QScintilla</source>
+        <translation></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>QScintilla</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
         <source>Calltips</source>
         <translation>Dicas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>Tratamento de Ficheiros</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
-        <source>Searching</source>
-        <translation>Procurando</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+        <source>Searching</source>
+        <translation>Procurando</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
         <source>Spell checking</source>
         <translation>Verificação ortográfica</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>Digitação</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>Digitação</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>Exportadores</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>Realçadores</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>Associações de Tipos de Ficheiros</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>Estilos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
-        <source>Keywords</source>
-        <translation>Palavras Chave</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+        <source>Keywords</source>
+        <translation>Palavras Chave</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
-        <source>Help</source>
-        <translation>Ajuda</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
-        <source>Appearance</source>
-        <translation>Aparência</translation>
+        <source>Help</source>
+        <translation>Ajuda</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <source>Appearance</source>
+        <translation>Aparência</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>Documentação de Ajuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>Visualizadores de Ajuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>Projeto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
-        <source>Project Viewer</source>
-        <translation>Visualizador de Projeto</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>Projeto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
+        <source>Project Viewer</source>
+        <translation>Visualizador de Projeto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>Multiprojeto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>Gestor de Vista</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation>Por favor selecione uma entrada da lista
 para mostrar a página de configuração.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation>Erro na Página de Configuração</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;A página de configuração &lt;b&gt;{0}&lt;/b&gt; não pôde ser carregada.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation>Iniciador de Bandeja de Sistema</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation>Interface de VirusTotal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
@@ -4437,12 +4437,12 @@
         <translation type="obsolete">Navegador Web de eric5</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation>Introduzir texto do filtro...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation>Notificações</translation>
     </message>
@@ -4452,12 +4452,12 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation>Verificadores de Código</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation>Navegador Web de eric6</translation>
     </message>
@@ -4466,6 +4466,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished">Visualizador de Registos</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -32578,6 +32583,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="250"/>
@@ -35873,17 +35911,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
@@ -35898,12 +35936,12 @@
         <translation type="obsolete">Selecionar o intérprete de Python2 a usar:</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_ru.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_ru.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3956,207 +3956,207 @@
         <translation>Пиктограммы</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>Менеджер плагинов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>Принтер</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation>Оболочка</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>Задачи</translation>
+        <source>Shell</source>
+        <translation>Оболочка</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>Задачи</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>Шаблоны</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>Системы контроля версий</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>Отладчик</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Ruby</source>
         <translation>Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation>Редактор</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
-        <translation>API</translation>
+        <source>Editor</source>
+        <translation>Редактор</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation>API</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
         <source>Autocompletion</source>
         <translation>Автозавершение</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Calltips</source>
         <translation>Подсказки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>General</source>
         <translation>Общее</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>Набор</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>Набор</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>Экспортёры</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>Подсветчики</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>Ассоциации для типа файла</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>Стили</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>Просмотрщики справки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>Проект</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
-        <source>Project Viewer</source>
-        <translation>Просмотрщик проекта</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>Проект</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
+        <source>Project Viewer</source>
+        <translation>Просмотрщик проекта</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>Мултипроект</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>Управление видом</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation>Ошибка страницы конфигурации</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Страница конфигурации &lt;b&gt;{0}&lt;/b&gt; не может быть загружена.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>Режим работы с файлами</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
         <source>Searching</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
         <source>Appearance</source>
         <translation>Стили</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <source>Properties</source>
+        <translation>Свойства</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
+        <source>Preferences</source>
+        <translation>Предпочтения</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <source>Network</source>
+        <translation>Сеть</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
+        <source>Spell checking</source>
+        <translation>Проверка орфографии</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <source>Python3</source>
+        <translation>Python3</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
-        <source>Properties</source>
-        <translation>Свойства</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
-        <source>Preferences</source>
-        <translation>Предпочтения</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
-        <source>Network</source>
-        <translation>Сеть</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
-        <source>Spell checking</source>
-        <translation>Проверка орфографии</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
-        <source>Python3</source>
-        <translation>Python3</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
         <source>Keywords</source>
         <translation>Ключевые слова</translation>
     </message>
@@ -4166,27 +4166,27 @@
         <translation>Кооперация</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation>Запуск Eric в системном лотке</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation>VirusTotal интерфейс</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation>Задайте фильтр текста...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation>Уведомления</translation>
     </message>
@@ -4196,17 +4196,17 @@
         <translation>IRC</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation>Проверяльщики кода</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation>WEB просмотрщик встроенный в Eric</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation>Выберите элемент в списке, чтобы
@@ -4217,6 +4217,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished">Просмотрщик журнала</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31684,27 +31689,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation>Выбрать всё</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation>Настроить...</translation>
     </message>
@@ -31757,17 +31762,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32310,6 +32315,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="373"/>
@@ -35608,27 +35646,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Задайте интерпретатор Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Задайте интерпретатор Python{0}:</translation>
     </message>
--- a/i18n/eric6_tr.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_tr.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3939,239 +3939,239 @@
         <translation>İconlar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
         <source>Network</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>Eklenti Yöneticisi</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>Yazıcı</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation>Kabuk</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>Görevler</translation>
+        <source>Shell</source>
+        <translation>Kabuk</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>Görevler</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>Şablonlar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>Sürüm Kontrol Sistemi</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>Hata Ayıklayıcı</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
-        <source>General</source>
-        <translation>Genel</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
-        <source>Python3</source>
-        <translation>Python3</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
-        <source>Ruby</source>
-        <translation>Ruby</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation>Düzenleyici</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
-        <translation>API&apos;ler</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
-        <source>Autocompletion</source>
-        <translation>Otomatik tamamlama</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>QScintilla</source>
-        <translation>QScintilla</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
-        <source>Calltips</source>
-        <translation>İpuçları</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <source>General</source>
+        <translation>Genel</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <source>Python3</source>
+        <translation>Python3</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
+        <source>Ruby</source>
+        <translation>Ruby</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
+        <source>Editor</source>
+        <translation>Düzenleyici</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation>API&apos;ler</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
+        <source>Autocompletion</source>
+        <translation>Otomatik tamamlama</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>QScintilla</source>
+        <translation>QScintilla</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <source>Calltips</source>
+        <translation>İpuçları</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>Dosyaişleme</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
-        <source>Searching</source>
-        <translation>Arıyor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+        <source>Searching</source>
+        <translation>Arıyor</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
         <source>Spell checking</source>
         <translation>Yazım Kontrolü</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>Yazıyor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>Yazıyor</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>Dışaaktarım</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>Metin Vurgulayıcı</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>Dosyatipi Birleştirme</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>Stiller</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
-        <source>Keywords</source>
-        <translation>Anahtar Sözcükler</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+        <source>Keywords</source>
+        <translation>Anahtar Sözcükler</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
         <source>Properties</source>
         <translation>Özellikler</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
-        <source>Help</source>
-        <translation>Yardım</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
-        <source>Appearance</source>
-        <translation>Görünüm</translation>
+        <source>Help</source>
+        <translation>Yardım</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <source>Appearance</source>
+        <translation>Görünüm</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>Yardım Belgeleri</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>Yardım Göstericiler</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>Proje</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>Proje</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
         <source>Project Viewer</source>
         <translation>Proje Görüntüleyici</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>Çokluproje</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation>Arayüz</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>Görünüm Yönetcisi</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
         <source>Preferences</source>
         <translation>Seçenekler</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation>Lütfen ayarlama sayfasını
 göstermek için gelen listeyi seçiniz.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation>Ayarlama Sayfası Hatası</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;TAyarlama sayfası &lt;b&gt;{0}&lt;/b&gt; yüklenemiyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation type="unfinished">Güvenlik</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4181,12 +4181,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished">Eric5 Web Gözatıcısı {6 ?}</translation>
     </message>
@@ -4195,6 +4195,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished">Kayıt-Gösterici</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31486,27 +31491,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation type="unfinished">Temizle</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation type="unfinished">Kopyala</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation type="unfinished">Bul</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation type="unfinished">Hepsini Seç</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation type="unfinished">Ayarlanıyor...</translation>
     </message>
@@ -31559,17 +31564,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32109,6 +32114,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="319"/>
@@ -35386,27 +35424,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_zh_CN.GB2312.ts	Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_zh_CN.GB2312.ts	Sat Feb 07 12:38:32 2015 +0100
@@ -3924,213 +3924,213 @@
         <translation>图标</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
         <source>Network</source>
         <translation>网络</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
         <source>Plugin Manager</source>
         <translation>插件管理器</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
         <source>Printer</source>
         <translation>打印机</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
-        <source>Shell</source>
-        <translation>命令行</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="174"/>
-        <source>Tasks</source>
-        <translation>任务</translation>
+        <source>Shell</source>
+        <translation>命令行</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+        <source>Tasks</source>
+        <translation>任务</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
         <source>Templates</source>
         <translation>模板</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
         <source>Version Control Systems</source>
         <translation>版本控制系统</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
         <source>Debugger</source>
         <translation>调试器</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <source>General</source>
+        <translation>通用配置</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
+        <source>Ruby</source>
+        <translation>Ruby</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
+        <source>Editor</source>
+        <translation>编辑器</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+        <source>APIs</source>
+        <translation>API</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
+        <source>Autocompletion</source>
+        <translation>自动完成</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
-        <source>General</source>
-        <translation>通用配置</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
-        <source>Ruby</source>
-        <translation>Ruby</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
-        <source>Editor</source>
-        <translation>编辑器</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
-        <source>APIs</source>
-        <translation>API</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
-        <source>Autocompletion</source>
-        <translation>自动完成</translation>
+        <source>QScintilla</source>
+        <translation>QScintilla</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>QScintilla</source>
-        <translation>QScintilla</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
         <source>Calltips</source>
         <translation>调用提示</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
         <source>Filehandling</source>
         <translation>文件处理</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
-        <source>Searching</source>
-        <translation>查找</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+        <source>Searching</source>
+        <translation>查找</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
         <source>Spell checking</source>
         <translation>拼写检查</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>Style</source>
         <translation>风格</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
-        <source>Typing</source>
-        <translation>键盘输入</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+        <source>Typing</source>
+        <translation>键盘输入</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
         <source>Exporters</source>
         <translation>输出器</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
         <source>Highlighters</source>
         <translation>高亮功能</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
         <source>Filetype Associations</source>
         <translation>文件类型关联</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
         <source>Styles</source>
         <translation>风格</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
         <source>Properties</source>
         <translation>属性</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
         <source>Help Documentation</source>
         <translation>帮助文档</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Help Viewers</source>
         <translation>帮助浏览器</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <source>Project</source>
+        <translation>项目</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="297"/>
-        <source>Project</source>
-        <translation>项目</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
         <source>Project Viewer</source>
         <translation>项目浏览器</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
         <source>Multiproject</source>
         <translation>多重项目</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
         <source>Interface</source>
         <translation>界面</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
         <source>Viewmanager</source>
         <translation>视图管理器</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
         <source>Appearance</source>
         <translation>外观</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
         <source>Preferences</source>
         <translation>参数选择</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
         <source>Please select an entry of the list
 to display the configuration page.</source>
         <translation>请在左边选择一个列表项以显示配置页面。</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>Configuration Page Error</source>
         <translation>配置页面错误</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
         <source>Python3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
         <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4140,27 +4140,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
         <source>Enter filter text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
         <source>Notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4170,12 +4170,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Code Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4184,6 +4184,11 @@
         <source>Log-Viewer</source>
         <translation type="unfinished">日志浏览器</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+        <source>Mimetypes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -31448,27 +31453,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="115"/>
         <source>Clear</source>
         <translation type="unfinished">清除</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="116"/>
         <source>Copy</source>
         <translation type="unfinished">复制</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="118"/>
         <source>Find</source>
         <translation type="unfinished">查找</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="120"/>
         <source>Select All</source>
         <translation type="unfinished">全选</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Configure...</source>
         <translation type="unfinished">配置……</translation>
     </message>
@@ -31521,17 +31526,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
         <source>&lt;b&gt;Message Filters for Standard Output&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
         <source>&lt;b&gt;Message Filters for Standard Error &lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+        <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
         <source>&lt;b&gt;Message Filters for both&lt;/b&gt;&lt;p&gt;This list shows the configured message filters used to suppress messages received via stdout or stderr.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32071,6 +32076,39 @@
     </message>
 </context>
 <context>
+    <name>MimeTypesPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Text Mimetypes&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+        <source>Press to reset the list to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+        <source>Reset to Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Reset Mime Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+        <source>Do you really want to reset the configured list of mime types?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+        <source>Files of the mime types configured below are opened in an eric editor (in addition to all &apos;text&apos; mime types).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MiniEditor</name>
     <message>
         <location filename="../QScintilla/MiniEditor.py" line="373"/>
@@ -35348,27 +35386,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1185"/>
+        <location filename="../Preferences/__init__.py" line="1289"/>
         <source>Export Preferences</source>
         <translation>导出首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Import Preferences</source>
         <translation>导入首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1213"/>
+        <location filename="../Preferences/__init__.py" line="1317"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1315"/>
+        <location filename="../Preferences/__init__.py" line="1419"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
Binary file icons/default/preferences-mimetypes.png has changed
APIs/Python3/eric6.api		file \| annotate \| diff \| comparison \| revisions
APIs/Python3/eric6.bas		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qch		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qhp		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.Preferences.ConfigurationPages.LogViewerPage.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.Preferences.ConfigurationPages.MimeTypesPage.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.Utilities.MimeTypes.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/index-eric6.Preferences.ConfigurationPages.html		file \| annotate \| diff \| comparison \| revisions
Preferences/ConfigurationDialog.py		file \| annotate \| diff \| comparison \| revisions
Preferences/ConfigurationPages/LogViewerPage.py		file \| annotate \| diff \| comparison \| revisions
Preferences/ConfigurationPages/MimeTypesPage.py		file \| annotate \| diff \| comparison \| revisions
Preferences/ConfigurationPages/MimeTypesPage.ui		file \| annotate \| diff \| comparison \| revisions
Preferences/__init__.py		file \| annotate \| diff \| comparison \| revisions
Utilities/MimeTypes.py		file \| annotate \| diff \| comparison \| revisions
changelog		file \| annotate \| diff \| comparison \| revisions
eric6.e4p		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_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.GB2312.ts		file \| annotate \| diff \| comparison \| revisions
icons/default/preferences-mimetypes.png		file \| annotate \| diff \| comparison \| revisions