eric: changeset 5837:9ef6a28f1694

--- a/APIs/Python3/eric6.api	Mon Aug 07 12:19:34 2017 +0200
+++ b/APIs/Python3/eric6.api	Mon Aug 07 18:00:51 2017 +0200
@@ -7517,6 +7517,8 @@
 eric6.QScintilla.Exporters.ExporterHTML.ExporterHTML?1(editor, parent=None)
 eric6.QScintilla.Exporters.ExporterHTML.HTMLGenerator.generate?4(tabSize=4, useTabs=False, wysiwyg=True, folding=False, onlyStylesUsed=False, titleFullPath=False)
 eric6.QScintilla.Exporters.ExporterHTML.HTMLGenerator?1(editor)
+eric6.QScintilla.Exporters.ExporterHTML._StrikeThroughExtension.DEL_RE?7
+eric6.QScintilla.Exporters.ExporterHTML._StrikeThroughExtension.extendMarkdown?4(md, md_globals)
 eric6.QScintilla.Exporters.ExporterODT.ExporterODT.exportSource?4()
 eric6.QScintilla.Exporters.ExporterODT.ExporterODT?1(editor, parent=None)
 eric6.QScintilla.Exporters.ExporterPDF.ExporterPDF.exportSource?4()
@@ -8838,7 +8840,7 @@
 eric6.UI.Previewer.Previewer.shutdown?4()
 eric6.UI.Previewer.Previewer?1(viewmanager, splitter, parent=None)
 eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.htmlReady?7
-eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.process?4(filePath, language, text, ssiEnabled, rootPath, useSphinx)
+eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.process?4(filePath, language, text, ssiEnabled, rootPath, useSphinx, convertNewLineToBreak, markdownHtmlFormat, restDocutilsHtmlFormat)
 eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.run?4()
 eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread?1(parent=None)
 eric6.UI.Previewers.PreviewerHTML.PreviewerHTML.on_jsCheckBox_clicked?4(checked)
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Mon Aug 07 12:19:34 2017 +0200
+++ b/Documentation/Help/source.qhp	Mon Aug 07 18:00:51 2017 +0200
@@ -5598,6 +5598,8 @@
       <keyword name="ExporterHTML" id="ExporterHTML" ref="eric6.QScintilla.Exporters.ExporterHTML.html#ExporterHTML" />
       <keyword name="ExporterHTML (Constructor)" id="ExporterHTML (Constructor)" ref="eric6.QScintilla.Exporters.ExporterHTML.html#ExporterHTML.__init__" />
       <keyword name="ExporterHTML (Module)" id="ExporterHTML (Module)" ref="eric6.QScintilla.Exporters.ExporterHTML.html" />
+      <keyword name="ExporterHTML.__generateFromMarkdown" id="ExporterHTML.__generateFromMarkdown" ref="eric6.QScintilla.Exporters.ExporterHTML.html#ExporterHTML.__generateFromMarkdown" />
+      <keyword name="ExporterHTML.__generateFromReSTDocutils" id="ExporterHTML.__generateFromReSTDocutils" ref="eric6.QScintilla.Exporters.ExporterHTML.html#ExporterHTML.__generateFromReSTDocutils" />
       <keyword name="ExporterHTML.exportSource" id="ExporterHTML.exportSource" ref="eric6.QScintilla.Exporters.ExporterHTML.html#ExporterHTML.exportSource" />
       <keyword name="ExporterODT" id="ExporterODT" ref="eric6.QScintilla.Exporters.ExporterODT.html#ExporterODT" />
       <keyword name="ExporterODT (Constructor)" id="ExporterODT (Constructor)" ref="eric6.QScintilla.Exporters.ExporterODT.html#ExporterODT.__init__" />
@@ -16664,7 +16666,9 @@
       <keyword name="_ClbrBase" id="_ClbrBase" ref="eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html#_ClbrBase" />
       <keyword name="_ClbrBase (Constructor)" id="_ClbrBase (Constructor)" ref="eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html#_ClbrBase.__init__" />
       <keyword name="_ClbrBase.setEndLine" id="_ClbrBase.setEndLine" ref="eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html#_ClbrBase.setEndLine" />
+      <keyword name="_StrikeThroughExtension" id="_StrikeThroughExtension" ref="eric6.QScintilla.Exporters.ExporterHTML.html#_StrikeThroughExtension" />
       <keyword name="_StrikeThroughExtension" id="_StrikeThroughExtension" ref="eric6.UI.Previewers.PreviewerHTML.html#_StrikeThroughExtension" />
+      <keyword name="_StrikeThroughExtension.extendMarkdown" id="_StrikeThroughExtension.extendMarkdown" ref="eric6.QScintilla.Exporters.ExporterHTML.html#_StrikeThroughExtension.extendMarkdown" />
       <keyword name="_StrikeThroughExtension.extendMarkdown" id="_StrikeThroughExtension.extendMarkdown" ref="eric6.UI.Previewers.PreviewerHTML.html#_StrikeThroughExtension.extendMarkdown" />
       <keyword name="__check" id="__check" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#__check" />
       <keyword name="__checkCodeStyle" id="__checkCodeStyle" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#__checkCodeStyle" />
--- a/Documentation/Source/eric6.QScintilla.Exporters.ExporterHTML.html	Mon Aug 07 12:19:34 2017 +0200
+++ b/Documentation/Source/eric6.QScintilla.Exporters.ExporterHTML.html	Mon Aug 07 18:00:51 2017 +0200
@@ -35,6 +35,9 @@
 </tr><tr>
 <td><a href="#HTMLGenerator">HTMLGenerator</a></td>
 <td>Class implementing an HTML generator for exporting source code.</td>
+</tr><tr>
+<td><a href="#_StrikeThroughExtension">_StrikeThroughExtension</a></td>
+<td>Class is placed here, because it depends on imported markdown, and markdown import is lazy.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -63,6 +66,12 @@
 <td><a href="#ExporterHTML.__init__">ExporterHTML</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#ExporterHTML.__generateFromMarkdown">__generateFromMarkdown</a></td>
+<td>Private method to convert Markdown text into HTML.</td>
+</tr><tr>
+<td><a href="#ExporterHTML.__generateFromReSTDocutils">__generateFromReSTDocutils</a></td>
+<td>Private method to convert ReST text into HTML using 'docutils'.</td>
+</tr><tr>
 <td><a href="#ExporterHTML.exportSource">exportSource</a></td>
 <td>Public method performing the export.</td>
 </tr>
@@ -84,6 +93,31 @@
 <dd>
 parent object of the exporter (QObject)
 </dd>
+</dl><a NAME="ExporterHTML.__generateFromMarkdown" ID="ExporterHTML.__generateFromMarkdown"></a>
+<h4>ExporterHTML.__generateFromMarkdown</h4>
+<b>__generateFromMarkdown</b>(<i></i>)
+<p>
+        Private method to convert Markdown text into HTML.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+processed HTML
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="ExporterHTML.__generateFromReSTDocutils" ID="ExporterHTML.__generateFromReSTDocutils"></a>
+<h4>ExporterHTML.__generateFromReSTDocutils</h4>
+<b>__generateFromReSTDocutils</b>(<i></i>)
+<p>
+        Private method to convert ReST text into HTML using 'docutils'.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+processed HTML (string)
+</dd>
 </dl><a NAME="ExporterHTML.exportSource" ID="ExporterHTML.exportSource"></a>
 <h4>ExporterHTML.exportSource</h4>
 <b>exportSource</b>(<i></i>)
@@ -165,5 +199,42 @@
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="_StrikeThroughExtension" ID="_StrikeThroughExtension"></a>
+<h2>_StrikeThroughExtension</h2>
+<p>
+                Class is placed here, because it depends on imported markdown,
+                and markdown import is lazy.
+</p><p>
+                (see http://achinghead.com/
+                python-markdown-adding-insert-delete.html this page for
+                details)
+</p>
+<h3>Derived from</h3>
+markdown.Extension
+<h3>Class Attributes</h3>
+<table>
+<tr><td>DEL_RE</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#_StrikeThroughExtension.extendMarkdown">extendMarkdown</a></td>
+<td></td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="_StrikeThroughExtension.extendMarkdown" ID="_StrikeThroughExtension.extendMarkdown"></a>
+<h4>_StrikeThroughExtension.extendMarkdown</h4>
+<b>extendMarkdown</b>(<i>md, md_globals</i>)
+
+<div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html	Mon Aug 07 12:19:34 2017 +0200
+++ b/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html	Mon Aug 07 18:00:51 2017 +0200
@@ -115,13 +115,20 @@
 </dd>
 </dl><a NAME="PreviewProcessingThread.__convertMarkdown" ID="PreviewProcessingThread.__convertMarkdown"></a>
 <h4>PreviewProcessingThread.__convertMarkdown</h4>
-<b>__convertMarkdown</b>(<i>text</i>)
+<b>__convertMarkdown</b>(<i>text, convertNewLineToBreak, htmlFormat</i>)
 <p>
         Private method to convert Markdown text into HTML.
 </p><dl>
 <dt><i>text</i></dt>
 <dd>
 text to be processed (string)
+</dd><dt><i>convertNewLineToBreak</i></dt>
+<dd>
+flag indicating to convert new lines
+            to HTML break (Markdown only) (boolean)
+</dd><dt><i>htmlFormat</i></dt>
+<dd>
+HTML format to be generated by markdown (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -130,7 +137,7 @@
 </dd>
 </dl><a NAME="PreviewProcessingThread.__convertReST" ID="PreviewProcessingThread.__convertReST"></a>
 <h4>PreviewProcessingThread.__convertReST</h4>
-<b>__convertReST</b>(<i>text, useSphinx</i>)
+<b>__convertReST</b>(<i>text, useSphinx, restDocutilsHtmlFormat</i>)
 <p>
         Private method to convert ReST text into HTML.
 </p><dl>
@@ -141,6 +148,10 @@
 <dd>
 flag indicating to use Sphinx to generate the
             ReST preview (boolean)
+</dd><dt><i>restDocutilsHtmlFormat</i></dt>
+<dd>
+HTML format to be generated by docutils
+            (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -149,13 +160,16 @@
 </dd>
 </dl><a NAME="PreviewProcessingThread.__convertReSTDocutils" ID="PreviewProcessingThread.__convertReSTDocutils"></a>
 <h4>PreviewProcessingThread.__convertReSTDocutils</h4>
-<b>__convertReSTDocutils</b>(<i>text</i>)
+<b>__convertReSTDocutils</b>(<i>text, htmlFormat</i>)
 <p>
         Private method to convert ReST text into HTML using 'docutils'.
 </p><dl>
 <dt><i>text</i></dt>
 <dd>
 text to be processed (string)
+</dd><dt><i>htmlFormat</i></dt>
+<dd>
+HTML format to be generated (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -179,7 +193,7 @@
 </dd>
 </dl><a NAME="PreviewProcessingThread.__getHtml" ID="PreviewProcessingThread.__getHtml"></a>
 <h4>PreviewProcessingThread.__getHtml</h4>
-<b>__getHtml</b>(<i>language, text, ssiEnabled, filePath, rootPath, useSphinx</i>)
+<b>__getHtml</b>(<i>language, text, ssiEnabled, filePath, rootPath, useSphinx, convertNewLineToBreak, markdownHtmlFormat, restDocutilsHtmlFormat</i>)
 <p>
         Private method to process the given text depending upon the given
         language.
@@ -204,6 +218,18 @@
 <dd>
 flag indicating to use Sphinx to generate the
             ReST preview (boolean)
+</dd><dt><i>convertNewLineToBreak</i></dt>
+<dd>
+flag indicating to convert new lines
+            to HTML break (Markdown only) (boolean)
+</dd><dt><i>markdownHtmlFormat</i></dt>
+<dd>
+HTML format to be generated by markdown
+            (string)
+</dd><dt><i>restDocutilsHtmlFormat</i></dt>
+<dd>
+HTML format to be generated by docutils
+            (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -236,7 +262,7 @@
 </dd>
 </dl><a NAME="PreviewProcessingThread.process" ID="PreviewProcessingThread.process"></a>
 <h4>PreviewProcessingThread.process</h4>
-<b>process</b>(<i>filePath, language, text, ssiEnabled, rootPath, useSphinx</i>)
+<b>process</b>(<i>filePath, language, text, ssiEnabled, rootPath, useSphinx, convertNewLineToBreak, markdownHtmlFormat, restDocutilsHtmlFormat</i>)
 <p>
         Public method to convert the given text to HTML.
 </p><dl>
@@ -260,6 +286,18 @@
 <dd>
 flag indicating to use Sphinx to generate the
             ReST preview (boolean)
+</dd><dt><i>convertNewLineToBreak</i></dt>
+<dd>
+flag indicating to convert new lines
+            to HTML break (Markdown only) (boolean)
+</dd><dt><i>markdownHtmlFormat</i></dt>
+<dd>
+HTML format to be generated by markdown
+            (string)
+</dd><dt><i>restDocutilsHtmlFormat</i></dt>
+<dd>
+HTML format to be generated by docutils
+            (string)
 </dd>
 </dl><a NAME="PreviewProcessingThread.run" ID="PreviewProcessingThread.run"></a>
 <h4>PreviewProcessingThread.run</h4>
--- a/Preferences/ConfigurationPages/EditorFilePage.py	Mon Aug 07 12:19:34 2017 +0200
+++ b/Preferences/ConfigurationPages/EditorFilePage.py	Mon Aug 07 18:00:51 2017 +0200
@@ -45,6 +45,11 @@

         self.defaultEncodingComboBox.addItems(sorted(supportedCodecs))

+        self.previewMarkdownHTMLFormatComboBox.addItems(
+            ["XHTML1", "HTML4", "HTML5"])
+        self.previewRestDocutilsHTMLFormatComboBox.addItems(
+            ["HTML4", "HTML5"])
+
         # set initial values
         self.autosaveSlider.setValue(
             Preferences.getEditor("AutosaveInterval"))
@@ -91,6 +96,14 @@
             " ".join(Preferences.getEditor("PreviewQssFileNameExtensions")))
         self.previewRestSphinxCheckBox.setChecked(
             Preferences.getEditor("PreviewRestUseSphinx"))
+        self.previewMarkdownNLtoBreakCheckBox.setChecked(
+            Preferences.getEditor("PreviewMarkdownNLtoBR"))
+        index = self.previewMarkdownHTMLFormatComboBox.findText(
+            Preferences.getEditor("PreviewMarkdownHTMLFormat"))
+        self.previewMarkdownHTMLFormatComboBox.setCurrentIndex(index)
+        index = self.previewRestDocutilsHTMLFormatComboBox.findText(
+            Preferences.getEditor("PreviewRestDocutilsHTMLFormat"))
+        self.previewRestDocutilsHTMLFormatComboBox.setCurrentIndex(index)

     def save(self):
         """
@@ -161,6 +174,15 @@
         Preferences.setEditor(
             "PreviewRestUseSphinx",
             self.previewRestSphinxCheckBox.isChecked())
+        Preferences.setEditor(
+            "PreviewMarkdownNLtoBR",
+            self.previewMarkdownNLtoBreakCheckBox.isChecked())
+        Preferences.setEditor(
+            "PreviewMarkdownHTMLFormat",
+            self.previewMarkdownHTMLFormatComboBox.currentText())
+        Preferences.setEditor(
+            "PreviewRestDocutilsHTMLFormat",
+            self.previewRestDocutilsHTMLFormatComboBox.currentText())

     def __setDefaultFiltersLists(self, keepSelection=False):
         """
--- a/Preferences/ConfigurationPages/EditorFilePage.ui	Mon Aug 07 12:19:34 2017 +0200
+++ b/Preferences/ConfigurationPages/EditorFilePage.ui	Mon Aug 07 18:00:51 2017 +0200
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>1193</height>
+    <height>1622</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -444,71 +444,166 @@
      <property name="title">
       <string>File Preview</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Extensions of HTML files:</string>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QGroupBox" name="groupBox_12">
+        <property name="title">
+         <string>HTML Files</string>
         </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label_12">
+           <property name="text">
+            <string>Extensions:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="previewHtmlExtensionsEdit">
+           <property name="toolTip">
+            <string>Enter the filename extensions of HTML files that may be previewed (separated by a space)</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="previewHtmlExtensionsEdit">
-        <property name="toolTip">
-         <string>Enter the filename extensions of HTML files that may be previewed (separated by a space)</string>
+      <item>
+       <widget class="QGroupBox" name="groupBox_11">
+        <property name="title">
+         <string>Markdown Files</string>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>Extensions of Markdown files:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="previewMarkdownExtensionsEdit">
-        <property name="toolTip">
-         <string>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</string>
-        </property>
+        <layout class="QGridLayout" name="gridLayout_4">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_11">
+           <property name="text">
+            <string>Extensions:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1" colspan="2">
+          <widget class="QLineEdit" name="previewMarkdownExtensionsEdit">
+           <property name="toolTip">
+            <string>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" colspan="3">
+          <widget class="QCheckBox" name="previewMarkdownNLtoBreakCheckBox">
+           <property name="toolTip">
+            <string>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</string>
+           </property>
+           <property name="text">
+            <string>Convert New Line to HTML Break</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0" colspan="2">
+          <widget class="QLabel" name="label_6">
+           <property name="text">
+            <string>HTML Format:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="2">
+          <widget class="QComboBox" name="previewMarkdownHTMLFormatComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="toolTip">
+            <string>Select the HTML format to be generated</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Extensions of ReST files:</string>
+      <item>
+       <widget class="QGroupBox" name="groupBox_10">
+        <property name="title">
+         <string>ReST Files</string>
         </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="previewRestExtensionsEdit">
-        <property name="toolTip">
-         <string>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</string>
-        </property>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_9">
+           <property name="text">
+            <string>Extensions:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="previewRestExtensionsEdit">
+           <property name="toolTip">
+            <string>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" colspan="2">
+          <widget class="QCheckBox" name="previewRestSphinxCheckBox">
+           <property name="toolTip">
+            <string>Select to use 'sphinx' to generate the ReST preview</string>
+           </property>
+           <property name="text">
+            <string>Use 'sphinx' for ReST preview</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0" colspan="2">
+          <widget class="QGroupBox" name="groupBox_13">
+           <property name="title">
+            <string>Docutils</string>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLabel" name="label_7">
+              <property name="text">
+               <string>HTML Format:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="previewRestDocutilsHTMLFormatComboBox">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="toolTip">
+               <string>Select the HTML format to be generated</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>Extensions of QSS files:</string>
+      <item>
+       <widget class="QGroupBox" name="groupBox_9">
+        <property name="title">
+         <string>QSS Files</string>
         </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="previewQssExtensionsEdit">
-        <property name="toolTip">
-         <string>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="2">
-       <widget class="QCheckBox" name="previewRestSphinxCheckBox">
-        <property name="toolTip">
-         <string>Select to use 'sphinx' to generate the ReST preview</string>
-        </property>
-        <property name="text">
-         <string>Use 'sphinx' for ReST preview</string>
-        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QLabel" name="label_10">
+           <property name="text">
+            <string>Extensions:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="previewQssExtensionsEdit">
+           <property name="toolTip">
+            <string>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>
@@ -537,8 +632,8 @@
   <tabstop>crRadioButton</tabstop>
   <tabstop>crlfRadioButton</tabstop>
   <tabstop>automaticEolConversionCheckBox</tabstop>
+  <tabstop>stripWhitespaceCheckBox</tabstop>
   <tabstop>createBackupFileCheckBox</tabstop>
-  <tabstop>stripWhitespaceCheckBox</tabstop>
   <tabstop>autosaveSlider</tabstop>
   <tabstop>advEncodingCheckBox</tabstop>
   <tabstop>defaultEncodingComboBox</tabstop>
@@ -550,6 +645,14 @@
   <tabstop>addFileFilterButton</tabstop>
   <tabstop>editFileFilterButton</tabstop>
   <tabstop>deleteFileFilterButton</tabstop>
+  <tabstop>previewHtmlExtensionsEdit</tabstop>
+  <tabstop>previewMarkdownExtensionsEdit</tabstop>
+  <tabstop>previewMarkdownNLtoBreakCheckBox</tabstop>
+  <tabstop>previewMarkdownHTMLFormatComboBox</tabstop>
+  <tabstop>previewRestExtensionsEdit</tabstop>
+  <tabstop>previewRestSphinxCheckBox</tabstop>
+  <tabstop>previewRestDocutilsHTMLFormatComboBox</tabstop>
+  <tabstop>previewQssExtensionsEdit</tabstop>
  </tabstops>
  <resources/>
  <connections>
--- a/Preferences/__init__.py	Mon Aug 07 12:19:34 2017 +0200
+++ b/Preferences/__init__.py	Mon Aug 07 18:00:51 2017 +0200
@@ -470,6 +470,9 @@
         "PreviewRestFileNameExtensions": ["rst"],
         "PreviewQssFileNameExtensions": ["qss"],
         "PreviewRestUseSphinx": False,
+        "PreviewMarkdownNLtoBR": True,
+        "PreviewMarkdownHTMLFormat": "XHTML1",  # XHTML1, HTML4, HTML5
+        "PreviewRestDocutilsHTMLFormat": "HTML5",   # HTML4, HTML5

         "VirtualSpaceOptions": QsciScintilla.SCVS_NONE,

@@ -2048,7 +2051,8 @@
     """
     if key in ["DefaultEncoding", "DefaultOpenFilter", "DefaultSaveFilter",
                "SpellCheckingDefaultLanguage", "SpellCheckingPersonalWordList",
-               "SpellCheckingPersonalExcludeList"]:
+               "SpellCheckingPersonalExcludeList",
+               "PreviewMarkdownHTMLFormat", "PreviewRestDocutilsHTMLFormat"]:
         return prefClass.settings.value(
             "Editor/" + key, prefClass.editorDefaults[key])
     elif key in ["AutosaveInterval", "TabWidth", "IndentWidth",
--- a/QScintilla/Exporters/ExporterHTML.py	Mon Aug 07 12:19:34 2017 +0200
+++ b/QScintilla/Exporters/ExporterHTML.py	Mon Aug 07 18:00:51 2017 +0200
@@ -9,10 +9,16 @@

 from __future__ import unicode_literals

+try:  # Only for Py2
+    import StringIO as io   # __IGNORE_EXCEPTION__
+except (ImportError, NameError):
+    import io       # __IGNORE_WARNING__
+
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>

 import os
+import sys

 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QCursor, QFontInfo
@@ -378,39 +384,206 @@
             QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
             QApplication.processEvents()

-            tabSize = Preferences.getEditor("TabWidth")
-            if tabSize == 0:
-                tabSize = 4
-            wysiwyg = Preferences.getEditorExporter("HTML/WYSIWYG")
-            folding = Preferences.getEditorExporter("HTML/Folding")
-            onlyStylesUsed = Preferences.getEditorExporter(
-                "HTML/OnlyStylesUsed")
-            titleFullPath = Preferences.getEditorExporter(
-                "HTML/FullPathAsTitle")
-            tabs = Preferences.getEditorExporter("HTML/UseTabs")
+            fn = self.editor.getFileName()
+            if fn:
+                extension = os.path.normcase(os.path.splitext(fn)[1][1:])
+            else:
+                extension = ""

-            generator = HTMLGenerator(self.editor)
-            html = generator.generate(
-                tabSize=tabSize,
-                useTabs=tabs,
-                wysiwyg=wysiwyg,
-                folding=folding,
-                onlyStylesUsed=onlyStylesUsed,
-                titleFullPath=titleFullPath
-            )
+            if extension in \
+                Preferences.getEditor("PreviewMarkdownFileNameExtensions") or \
+                    self.editor.getLanguage().lower() == "markdown":
+                # export markdown to HTML
+                html = self.__generateFromMarkdown()
+            elif extension in \
+                Preferences.getEditor("PreviewRestFileNameExtensions") or \
+                    self.editor.getLanguage().lower() == "restructuredtext":
+                # export ReST to HTML
+                html = self.__generateFromReSTDocutils()
+            else:
+                tabSize = Preferences.getEditor("TabWidth")
+                if tabSize == 0:
+                    tabSize = 4
+                wysiwyg = Preferences.getEditorExporter("HTML/WYSIWYG")
+                folding = Preferences.getEditorExporter("HTML/Folding")
+                onlyStylesUsed = Preferences.getEditorExporter(
+                    "HTML/OnlyStylesUsed")
+                titleFullPath = Preferences.getEditorExporter(
+                    "HTML/FullPathAsTitle")
+                tabs = Preferences.getEditorExporter("HTML/UseTabs")
+
+                generator = HTMLGenerator(self.editor)
+                html = generator.generate(
+                    tabSize=tabSize,
+                    useTabs=tabs,
+                    wysiwyg=wysiwyg,
+                    folding=folding,
+                    onlyStylesUsed=onlyStylesUsed,
+                    titleFullPath=titleFullPath
+                )

-            try:
-                f = open(filename, "w", encoding="utf-8")
-                f.write(html)
-                f.close()
-            except IOError as err:
+            if html:
+                try:
+                    f = open(filename, "w", encoding="utf-8")
+                    f.write(html)
+                    f.close()
+                except IOError as err:
+                    QApplication.restoreOverrideCursor()
+                    E5MessageBox.critical(
+                        self.editor,
+                        self.tr("Export source"),
+                        self.tr(
+                            """<p>The source could not be exported to"""
+                            """ <b>{0}</b>.</p><p>Reason: {1}</p>""")
+                        .format(filename, str(err)))
+            else:
                 QApplication.restoreOverrideCursor()
                 E5MessageBox.critical(
                     self.editor,
                     self.tr("Export source"),
                     self.tr(
                         """<p>The source could not be exported to"""
-                        """ <b>{0}</b>.</p><p>Reason: {1}</p>""")
-                    .format(filename, str(err)))
+                        """ <b>{0}</b>.</p><p>Reason: No HTML code"""
+                        """ generated.</p>""")
+                    .format(filename))
         finally:
             QApplication.restoreOverrideCursor()
+
+    def __generateFromReSTDocutils(self):
+        """
+        Private method to convert ReST text into HTML using 'docutils'.
+
+        @return processed HTML (string)
+        """
+        if 'sphinx' in sys.modules:
+            # Make sure any Sphinx polution of docutils has been removed.
+            unloadKeys = [k for k in sys.modules.keys()
+                          if k.startswith(('docutils', 'sphinx'))]
+            for key in unloadKeys:
+                sys.modules.pop(key)
+
+        try:
+            import docutils.core    # __IGNORE_EXCEPTION__
+        except ImportError:
+            E5MessageBox.critical(
+                self.editor,
+                self.tr("Export source"),
+                self.tr(
+                    """<p>ReStructuredText export requires the"""
+                    """ <b>python-docutils</b> package.<br/>Install it with"""
+                    """ your package manager, 'pip install docutils' or see"""
+                    """ <a href="http://pypi.python.org/pypi/docutils">"""
+                    """this page.</a></p>""")
+            )
+            return ""
+
+        htmlFormat = Preferences.getEditor(
+            "PreviewRestDocutilsHTMLFormat").lower()
+        # redirect sys.stderr because we are not interested in it here
+        origStderr = sys.stderr
+        sys.stderr = io.StringIO()
+        html = docutils.core.publish_string(
+            self.editor.text(), writer_name=htmlFormat).decode("utf-8")
+        sys.stderr = origStderr
+        return html
+
+    def __generateFromMarkdown(self):
+        """
+        Private method to convert Markdown text into HTML.
+
+        @return processed HTML
+        @rtype str
+        """
+        try:
+            import markdown     # __IGNORE_EXCEPTION__
+        except ImportError:
+            E5MessageBox.critical(
+                self.editor,
+                self.tr("Export source"),
+                self.tr(
+                    """<p>Markdown export requires the <b>python-markdown"""
+                    """</b> package.<br/>Install it with your package"""
+                    """ manager, pip install docutils' or see """
+                    """<a href="http://pythonhosted.org/Markdown/install"""
+                    """.html"> installation instructions.</a></p>""")
+            )
+            return ""
+
+        try:
+            import mdx_mathjax  # __IGNORE_EXCEPTION__ __IGNORE_WARNING__
+        except ImportError:
+            # mathjax doesn't require import statement if installed as
+            # extension
+            pass
+
+        if Preferences.getEditor("PreviewMarkdownNLtoBR"):
+            extensions = ['fenced_code', 'nl2br', 'extra']
+        else:
+            extensions = ['fenced_code', 'extra']
+
+        # version 2.0 supports only extension names, not instances
+        if markdown.version_info[0] > 2 or \
+                (markdown.version_info[0] == 2 and
+                 markdown.version_info[1] > 0):
+            class _StrikeThroughExtension(markdown.Extension):
+                """
+                Class is placed here, because it depends on imported markdown,
+                and markdown import is lazy.
+
+                (see http://achinghead.com/
+                python-markdown-adding-insert-delete.html this page for
+                details)
+                """
+                DEL_RE = r'(~~)(.*?)~~'
+
+                def extendMarkdown(self, md, md_globals):
+                    # Create the del pattern
+                    del_tag = markdown.inlinepatterns.SimpleTagPattern(
+                        self.DEL_RE, 'del')
+                    # Insert del pattern into markdown parser
+                    md.inlinePatterns.add('del', del_tag, '>not_strong')
+
+            extensions.append(_StrikeThroughExtension())
+
+        htmlFormat = Preferences.getEditor("PreviewMarkdownHTMLFormat").lower()
+        try:
+            body = markdown.markdown(self.editor.text(),
+                                     extensions=extensions + ['mathjax'],
+                                     output_format=htmlFormat)
+        except (ImportError, ValueError):
+            # markdown raises ValueError or ImportError, depends on version
+            # It is not clear, how to distinguish missing mathjax from other
+            # errors. So keep going without mathjax.
+            body = markdown.markdown(self.editor.text(),
+                                     extensions=extensions,
+                                     output_format=htmlFormat)
+
+        if htmlFormat == "xhtml1":
+            head = \
+                '''<!DOCTYPE html PUBLIC "-//W3C//DTD''' \
+                ''' XHTML 1.0 Transitional//EN"\n''' \
+                ''' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional''' \
+                '''.dtd">\n''' \
+                '''<html xmlns="http://www.w3.org/1999/xhtml">\n'''
+        elif htmlFormat == "html5":
+            head = \
+                '''<!DOCTYPE html>\n''' \
+                '''<html lang="EN">\n'''
+        else:
+            head = '<html lang="EN">\n'
+        head += '''<head>\n'''
+        if Preferences.getEditorExporter("HTML/FullPathAsTitle"):
+            head += '''<title>{0}</title>\n'''.format(
+                self.editor.getFileName())
+        else:
+            head += '''<title>{0}</title>\n'''.format(
+                os.path.basename(self.editor.getFileName()))
+        head += '''<meta name="Generator" content="eric6" />\n''' \
+            '''<meta http-equiv="Content-Type" ''' \
+            '''content="text/html; charset=utf-8" />\n''' \
+            '''</head>\n''' \
+            '''<body>\n'''
+
+        foot = '''\n</body>\n</html>\n'''
+
+        return head + body + foot
--- a/UI/Previewers/PreviewerHTML.py	Mon Aug 07 12:19:34 2017 +0200
+++ b/UI/Previewers/PreviewerHTML.py	Mon Aug 07 18:00:51 2017 +0200
@@ -10,7 +10,6 @@
 from __future__ import unicode_literals

 try:  # Only for Py2
-    basestring
     import StringIO as io   # __IGNORE_EXCEPTION__
 except (ImportError, NameError):
     import io       # __IGNORE_WARNING__
@@ -192,7 +191,10 @@
                 self.__processingThread.process(
                     fn, language, editor.text(),
                     self.ssiCheckBox.isChecked(), rootPath,
-                    Preferences.getEditor("PreviewRestUseSphinx"))
+                    Preferences.getEditor("PreviewRestUseSphinx"),
+                    Preferences.getEditor("PreviewMarkdownNLtoBR"),
+                    Preferences.getEditor("PreviewMarkdownHTMLFormat"),
+                    Preferences.getEditor("PreviewRestDocutilsHTMLFormat"))

     def __setHtml(self, filePath, html):
         """
@@ -357,7 +359,8 @@
         self.__lock = threading.Lock()

     def process(self, filePath, language, text, ssiEnabled, rootPath,
-                useSphinx):
+                useSphinx, convertNewLineToBreak, markdownHtmlFormat,
+                restDocutilsHtmlFormat):
         """
         Public method to convert the given text to HTML.

@@ -369,6 +372,12 @@
         @param rootPath root path to be used for SSI processing (str)
         @param useSphinx flag indicating to use Sphinx to generate the
             ReST preview (boolean)
+        @param convertNewLineToBreak flag indicating to convert new lines
+            to HTML break (Markdown only) (boolean)
+        @param markdownHtmlFormat HTML format to be generated by markdown
+            (string)
+        @param restDocutilsHtmlFormat HTML format to be generated by docutils
+            (string)
         """
         with self.__lock:
             self.__filePath = filePath
@@ -378,6 +387,9 @@
             self.__rootPath = rootPath
             self.__haveData = True
             self.__useSphinx = useSphinx
+            self.__convertNewLineToBreak = convertNewLineToBreak
+            self.__markdownHtmlFormat = markdownHtmlFormat
+            self.__restDocutilsHtmlFormat = restDocutilsHtmlFormat
             if not self.isRunning():
                 self.start(QThread.LowPriority)

@@ -394,10 +406,15 @@
                 ssiEnabled = self.__ssiEnabled
                 rootPath = self.__rootPath
                 useSphinx = self.__useSphinx
-                self.__haveData = False
+                convertNewLineToBreak = self.__convertNewLineToBreak
+                markdownHtmlFormat = self.__markdownHtmlFormat
+                restDocutilsHtmlFormat = self.__restDocutilsHtmlFormat

+                self.__haveData = False
+
             html = self.__getHtml(language, text, ssiEnabled, filePath,
-                                  rootPath, useSphinx)
+                                  rootPath, useSphinx, convertNewLineToBreak,
+                                  markdownHtmlFormat, restDocutilsHtmlFormat)

             with self.__lock:
                 if not self.__haveData:
@@ -406,7 +423,8 @@
                 # else - next iteration

     def __getHtml(self, language, text, ssiEnabled, filePath, rootPath,
-                  useSphinx):
+                  useSphinx, convertNewLineToBreak, markdownHtmlFormat,
+                  restDocutilsHtmlFormat):
         """
         Private method to process the given text depending upon the given
         language.
@@ -419,6 +437,12 @@
         @param rootPath root path to be used for SSI processing (str)
         @param useSphinx flag indicating to use Sphinx to generate the
             ReST preview (boolean)
+        @param convertNewLineToBreak flag indicating to convert new lines
+            to HTML break (Markdown only) (boolean)
+        @param markdownHtmlFormat HTML format to be generated by markdown
+            (string)
+        @param restDocutilsHtmlFormat HTML format to be generated by docutils
+            (string)
         @return processed HTML text (string)
         """
         if language == "HTML":
@@ -427,9 +451,10 @@
             else:
                 return text
         elif language == "Markdown":
-            return self.__convertMarkdown(text)
+            return self.__convertMarkdown(text, convertNewLineToBreak,
+                                          markdownHtmlFormat)
         elif language == "ReST":
-            return self.__convertReST(text, useSphinx)
+            return self.__convertReST(text, useSphinx, restDocutilsHtmlFormat)
         else:
             return self.tr(
                 "<p>No preview available for this type of file.</p>")
@@ -481,19 +506,21 @@

         return txt

-    def __convertReST(self, text, useSphinx):
+    def __convertReST(self, text, useSphinx, restDocutilsHtmlFormat):
         """
         Private method to convert ReST text into HTML.

         @param text text to be processed (string)
         @param useSphinx flag indicating to use Sphinx to generate the
             ReST preview (boolean)
+        @param restDocutilsHtmlFormat HTML format to be generated by docutils
+            (string)
         @return processed HTML (string)
         """
         if useSphinx:
             return self.__convertReSTSphinx(text)
         else:
-            return self.__convertReSTDocutils(text)
+            return self.__convertReSTDocutils(text, restDocutilsHtmlFormat)

     def __convertReSTSphinx(self, text):
         """
@@ -543,11 +570,12 @@

         return html

-    def __convertReSTDocutils(self, text):
+    def __convertReSTDocutils(self, text, htmlFormat):
         """
         Private method to convert ReST text into HTML using 'docutils'.

         @param text text to be processed (string)
+        @param htmlFormat HTML format to be generated (string)
         @return processed HTML (string)
         """
         if 'sphinx' in sys.modules:
@@ -570,16 +598,19 @@
         # redirect sys.stderr because we are not interested in it here
         origStderr = sys.stderr
         sys.stderr = io.StringIO()
-        html = docutils.core.publish_string(text, writer_name='html')\
-            .decode("utf-8")
+        html = docutils.core.publish_string(
+            text, writer_name=htmlFormat.lower()).decode("utf-8")
         sys.stderr = origStderr
         return html

-    def __convertMarkdown(self, text):
+    def __convertMarkdown(self, text, convertNewLineToBreak, htmlFormat):
         """
         Private method to convert Markdown text into HTML.

         @param text text to be processed (string)
+        @param convertNewLineToBreak flag indicating to convert new lines
+            to HTML break (Markdown only) (boolean)
+        @param htmlFormat HTML format to be generated by markdown (string)
         @return processed HTML (string)
         """
         try:
@@ -597,8 +628,11 @@
         except ImportError:
             #mathjax doesn't require import statement if installed as extension
             pass
-
-        extensions = ['fenced_code', 'nl2br', 'extra']
+
+        if convertNewLineToBreak:
+            extensions = ['fenced_code', 'nl2br', 'extra']
+        else:
+            extensions = ['fenced_code', 'extra']

         # version 2.0 supports only extension names, not instances
         if markdown.version_info[0] > 2 or \
@@ -625,9 +659,11 @@
             extensions.append(_StrikeThroughExtension())

         try:
-            return markdown.markdown(text, extensions + ['mathjax'])
+            return markdown.markdown(text, extensions=extensions + ['mathjax'],
+                                     output_format=htmlFormat.lower())
         except (ImportError, ValueError):
             # markdown raises ValueError or ImportError, depends on version
             # It is not clear, how to distinguish missing mathjax from other
             # errors. So keep going without mathjax.
-            return markdown.markdown(text, extensions)
+            return markdown.markdown(text, extensions=extensions,
+                                     output_format=htmlFormat.lower())
--- a/changelog	Mon Aug 07 12:19:34 2017 +0200
+++ b/changelog	Mon Aug 07 18:00:51 2017 +0200
@@ -2,6 +2,11 @@
 ----------
 Version 17.09:
 - bug fixes
+- Exporter
+  -- extended the HTML exporter to convert Markdown and ReST files to HTML
+- Previewers
+  -- added capability to configure the output format for the markdown and
+     docutils (ReST) previewers
 - Web Browser (NG)
   -- added support for Google Safe Browsing
--- a/i18n/eric6_cs.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_cs.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11423,22 +11423,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11453,55 +11453,85 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
-        <source>Extensions of HTML files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
-        <source>Extensions of Markdown files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
-        <source>Extensions of ReST files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
-        <source>Extensions of QSS files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -15411,20 +15441,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>Zdroj exportu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML soubory (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zdroj nemohl být do &lt;b&gt;{0}&lt;/b&gt; exportován.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -41031,27 +41076,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41072,22 +41117,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41095,37 +41140,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation type="unfinished">Zapnout JavaScript</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74720,6 +74765,9 @@
     </message>
 </context>
 <context>
+    <name>_StrikeThroughExtension</name>
+</context>
+<context>
     <name>eric6</name>
     <message>
         <location filename="../eric6.py" line="350"/>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_de.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11104,22 +11104,22 @@
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation>Dateifilter hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation>Ein Dateifilter zum Speichern darf genau ein Wildcard-Muster enthalten. Ihrer enthält {0}.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation>Ein Dateifilter muss mindestens ein Wildcard-Muster enthalten.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation>Gib den Dateifiltereintrag ein:</translation>
     </message>
@@ -11134,55 +11134,85 @@
         <translation>Dateivorschau</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
-        <source>Extensions of HTML files:</source>
-        <translation>Erweiterungen für HTML-Dateien:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation>Gib die Dateinamenerweiterungen von HTML-Dateien (getrennt durch Leerzeichen) ein, für die eine Vorschau angezeigt werden kann</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
-        <source>Extensions of Markdown files:</source>
-        <translation>Erweiterungen für Markdowndateien:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation>Gib die Dateinamenerweiterungen von Markdowndateien (getrennt durch Leerzeichen) ein, für die eine Vorschau angezeigt werden kann</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
-        <source>Extensions of ReST files:</source>
-        <translation>Erweiterungen für ReST-Dateien:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation>Gib die Dateinamenerweiterungen von ReStructuredText-Dateien (getrennt durch Leerzeichen) ein, für die eine Vorschau angezeigt werden kann</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
-        <source>Extensions of QSS files:</source>
-        <translation>Erweiterungen für QSS-Dateien:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation>Gib die Dateinamenerweiterungen von Qt-Stylesheetdateien (getrennt durch Leerzeichen) ein, für die eine Vorschau angezeigt werden kann</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation>Auswählen, um &apos;sphinx&apos; zur Erzeugung der ReST Vorschau zu verwenden</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation>&apos;sphinx&apos; für die ReST Vorschau verwenden</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation>HTML-Dateien</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation>Erweiterungen:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation>Markdown Dateien</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation>Auswählen, um Zeilenumbrüche in HTML &lt;br/&gt; Tags zu konvertieren.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation>Zeilenumbruch in HTML Break umwandeln</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation>HTML Format:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation>Wähle das zu erzeugende HTML Format aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation>ReST Dateien</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation>Docutils</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation>QSS Dateien</translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -14999,20 +15029,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>Quelltext exportieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Quelltext konnte nicht nach &lt;b&gt;{0}&lt;/b&gt; exportiert werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML-Dateien (*.html)</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Der Quelltext konnte nicht nach &lt;b&gt;{0}&lt;/b&gt; exportiert werden.&lt;/p&gt;&lt;p&gt;Ursache: Es wurde kein HTML Quelltext erzeugt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Der Markdown-Export erfordert das &lt;b&gt;python-markdown&lt;/b&gt;-Paket.&lt;br/&gt;Installiere es mit dem Paketmanager, &apos;pip install docutils&apos; oder siehe &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;die Installationsanleitung.&lt;/a&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Der ReStructuredText-Export erfordert das &lt;b&gt;python-docutils&lt;/b&gt;-Paket.&lt;br/&gt;Installiere es mit dem Paketmanager,&apos;pip install docutils&apos; oder siehe &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;diese Seite.&lt;/a&gt;&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -40120,27 +40165,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
@@ -40161,22 +40206,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Für diesen Dateityp ist keine Vorschau verfügbar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die ReStructuredText-Vorschau erfordert das &lt;b&gt;python-docutils&lt;/b&gt;-Paket.&lt;br/&gt;Installiere es mit dem Paketmanager,&apos;pip install docutils&apos; oder siehe &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;diese Seite.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die ReStructuredText-Vorschau erfordert das &lt;b&gt;sphinx&lt;/b&gt;-Paket.&lt;br/&gt;Installiere es mit dem Paketmanager,&apos;pip install Sphinx&apos; oder siehe &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;diese Seite.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternativ kann die Verwendung von Sphinx auf der Konfigurationsseite Editor, Dateibehandlung deaktiviert werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Markdown-Vorschau erfordert das &lt;b&gt;python-markdown&lt;/b&gt;-Paket.&lt;br/&gt;Installiere es mit dem Paketmanager, &apos;pip install docutils&apos; oder siehe &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;die Installationsanleitung.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
@@ -40184,37 +40229,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation>Auswählen, um JavaScript für die Vorschau zu aktivieren</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation>JavaScript aktivieren</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation>Auswählen, um Unterstützung für Server Side Includes zu aktivieren</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation>Server Side Includes aktivieren</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Für diesen Dateityp ist keine Vorschau verfügbar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation>Vorschau – {0}</translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation>Vorschau – {0}</translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation>Vorschau</translation>
     </message>
--- a/i18n/eric6_empty.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_empty.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11009,75 +11009,105 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
-        <source>Extensions of HTML files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
-        <source>Extensions of Markdown files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
-        <source>Extensions of ReST files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
-        <source>Extensions of QSS files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -14882,20 +14912,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -39914,27 +39959,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39955,22 +40000,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39978,37 +40023,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_en.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11013,22 +11013,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11043,55 +11043,85 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
-        <source>Extensions of HTML files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
-        <source>Extensions of Markdown files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
-        <source>Extensions of ReST files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
-        <source>Extensions of QSS files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -14896,20 +14926,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -39953,27 +39998,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39994,22 +40039,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40017,37 +40062,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_es.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11098,22 +11098,22 @@
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation>Añadir Filtro de Archivo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation>Un Filtro para Guardar Archivo debe tener exactamente un carácter de comodín. El suyo contiene {0}.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation>Un Filtro de Archivo debe contener al menos un carácter de comodín.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation>Introducir la entrada para filtro de archivo:</translation>
     </message>
@@ -11130,53 +11130,103 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
         <source>Extensions of HTML files:</source>
-        <translation>Extensiones de archivos HTML:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <translation type="obsolete">Extensiones de archivos HTML:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation>Introducir las extensiones de nombre de archivo para archivos de HTML que pueden ser previsualizados (separadas por un espacio)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
         <source>Extensions of Markdown files:</source>
-        <translation>Extensiones de archivos de Markdown:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <translation type="obsolete">Extensiones de archivos de Markdown:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation>Introducir las extensiones de nombre de archivo para archivos de Markdown que pueden ser previsualizados (separadas por un espacio)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
         <source>Extensions of ReST files:</source>
-        <translation>Extensiones de archivos ReST:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <translation type="obsolete">Extensiones de archivos ReST:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation>Introducir las extensiones de nombre de archivo para archivos de ReStructuredText que pueden ser previsualizados (separadas por un espacio)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
         <source>Extensions of QSS files:</source>
-        <translation>Extensiones de archivos QSS:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <translation type="obsolete">Extensiones de archivos QSS:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation>Introducir las extensiones de nombre de archivo para archivos de Hoja de Estilos de Qt que pueden ser previsualizados (separadas por un espacio)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation>Seleccionar para usar &apos;sphinx&apos; para generar la vista preliminar ReST</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation>Usar &apos;sphinx&apos; para la vista preliminar de ReST</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -15000,20 +15050,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>Archivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>Exportar código fuente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El código fuente no se ha podido exportar a &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;La previsualización de ReStructuredText requiere el package &lt;b&gt;python-docutils&lt;/b&gt; .&lt;br/&gt;Installar con el gestor de paquetes, &apos;pip install docutils&apos; o ver &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;esta página .&lt;/a&gt;&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -40121,27 +40186,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
@@ -40162,22 +40227,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;No hay vista previa disponible para este tipo de archivo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;La previsualización de ReStructuredText requiere el package &lt;b&gt;python-docutils&lt;/b&gt; .&lt;br/&gt;Installar con el gestor de paquetes, &apos;pip install docutils&apos; o ver &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;esta página .&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La previsualización de ReStructuredText requiere el package &lt;b&gt;sphinx&lt;/b&gt; .&lt;br/&gt;Installar con el gestor de paquetes, &apos;pip install sphinx&apos; o ver &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;esta página .&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Como alternativa, se puede deshabilitar el uso de Sphinx en el Editor, página de configuración de Gestión de Archivos.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;La previsualización de Markdown requiere el package &lt;b&gt;python-markdown&lt;/b&gt;.&lt;br/&gt;Instalar con el gestor de paquetes o ver en &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;las instrucciones de instalación.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
@@ -40185,37 +40250,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation>Seleccionar para habilitar JavaScript para las previsualizaciones de HTML</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation>Habilitar JavaScript</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation>Seleccionar para habilitar soporte para includes del Lado del Servidor</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation>Habilitar Includes del Lado del Servidor</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;No hay vista previa disponible para este tipo de archivo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation>Vista Previa - {0}</translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation>Vista Previa - {0}</translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation>Vista Previa</translation>
     </message>
@@ -73397,6 +73462,14 @@
     </message>
 </context>
 <context>
+    <name>_StrikeThroughExtension</name>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="574"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;La previsualización de ReStructuredText requiere el package &lt;b&gt;python-docutils&lt;/b&gt; .&lt;br/&gt;Installar con el gestor de paquetes, &apos;pip install docutils&apos; o ver &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;esta página .&lt;/a&gt;&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>eric6</name>
     <message>
         <location filename="../eric6.py" line="350"/>
--- a/i18n/eric6_fr.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_fr.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11419,22 +11419,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11449,55 +11449,85 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
-        <source>Extensions of HTML files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
-        <source>Extensions of Markdown files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
-        <source>Extensions of ReST files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
-        <source>Extensions of QSS files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -15413,20 +15443,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>Exportation de source</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>Fichiers HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -40812,27 +40857,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40853,22 +40898,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40876,37 +40921,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation type="unfinished">Activer JavaScript</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation type="unfinished">Aperçu</translation>
     </message>
@@ -74528,6 +74573,14 @@
     </message>
 </context>
 <context>
+    <name>_StrikeThroughExtension</name>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="574"/>
+        <source>Export source</source>
+        <translation type="obsolete">Exportation de source</translation>
+    </message>
+</context>
+<context>
     <name>eric6</name>
     <message>
         <location filename="../eric6.py" line="350"/>
--- a/i18n/eric6_it.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_it.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11548,22 +11548,22 @@
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation>Aggiungi filtro file</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation>Un filtro di salvataggio deve contenere esattamente un pattern con i caratteri jolly. Il tuo ne contiene {0}.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation>Un filtro file deve contenere almeno un pattern con caratteri jolly.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation>Inserisci il filtro file:</translation>
     </message>
@@ -11580,53 +11580,98 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
         <source>Extensions of HTML files:</source>
-        <translation>Estensioni dei file HTML:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <translation type="obsolete">Estensioni dei file HTML:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation>Digita le estensioni dei nomi file HTML che verranno visti in anteprima (separati da uno spazio)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
         <source>Extensions of Markdown files:</source>
-        <translation>Estensioni dei file Markdown:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <translation type="obsolete">Estensioni dei file Markdown:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation>Digita le estensioni dei nomi file Markdown che verranno visti in anteprima (separati da uno spazio)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
         <source>Extensions of ReST files:</source>
-        <translation>Estensioni dei file ReSTL:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <translation type="obsolete">Estensioni dei file ReSTL:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation>Digita le estensioni dei nomi file ReStructuredTest che verranno visti in anteprima (separati da uno spazio)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
-        <source>Extensions of QSS files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -15554,20 +15599,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>Esporta sorgenti</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>File HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il sorgente non può essere esportato a &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -41271,27 +41331,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41312,7 +41372,7 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Non è prevista la visualizzazione per questo tipo di flusso.&lt;/p&gt;</translation>
     </message>
@@ -41327,17 +41387,17 @@
         <translation type="obsolete">&lt;p&gt;La visualizzazione ReStructuredText richiede &lt;b&gt;il pacchetto&lt;/b&gt; python-docutils.&lt;br/&gt;Installarlo con il vostro gestore di pacchetti o vedere &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt; questa pagina.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41345,37 +41405,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation type="unfinished">Abilita Javascript</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Non è prevista la visualizzazione per questo tipo di flusso.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
@@ -75106,6 +75166,14 @@
     </message>
 </context>
 <context>
+    <name>_StrikeThroughExtension</name>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="574"/>
+        <source>Export source</source>
+        <translation type="obsolete">Esporta sorgenti</translation>
+    </message>
+</context>
+<context>
     <name>eric6</name>
     <message>
         <location filename="../eric6.py" line="350"/>
--- a/i18n/eric6_pt.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_pt.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11526,22 +11526,22 @@
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation>Adicionar Filtro de Ficheiros</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation>O Filtro de Gravar Ficheiro deve ter exactamente um padrão de caracteres curinga. O seu tem exatamente {0}.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation>Um Filtro de Ficheiros deve ter ao menos um caracter curinga.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation>Introduzir entrada do filtro de ficheiros:</translation>
     </message>
@@ -11558,53 +11558,103 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
         <source>Extensions of HTML files:</source>
-        <translation>Extensões dos ficheiros HTML:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <translation type="obsolete">Extensões dos ficheiros HTML:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation>Introduzir as extensões dos ficheiros HTML que se podem antever (separados por um espaço)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
         <source>Extensions of Markdown files:</source>
-        <translation>Extensões dos ficheiros Markdown:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <translation type="obsolete">Extensões dos ficheiros Markdown:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation>Introduzir as extensões dos ficheiros Markdown que se podem antever (separadas por um espaço)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
         <source>Extensions of ReST files:</source>
-        <translation>Extensões dos ficheiros ReST:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <translation type="obsolete">Extensões dos ficheiros ReST:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation>Introduzir as extensões dos ficheiros ReStructuredText que se podem previsualizar (separadas por um espaço)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
         <source>Extensions of QSS files:</source>
-        <translation>Extensões dos ficheiros QSS:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <translation type="obsolete">Extensões dos ficheiros QSS:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation>Introduzir as extensões dos ficheiros de Folhas de Estilo Qt que se podem previsualizar (separadas por um espaço)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation>Selecionar para usar &apos;sphinx&apos; para gerar a antevisão ReST</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation>Usar &apos;sphinx&apos; para antevisão de ReST</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -15531,20 +15581,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>Ficheiros HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>Exportar fonte</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pôde exportar a fonte para &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Razão: {1}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -41406,27 +41471,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Selecionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Selecionar o intérprete de Python{0} a usar:</translation>
     </message>
@@ -41447,22 +41512,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;A antevisão para este tipo de ficheiro não está disponível.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41470,37 +41535,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation>Habilitar JavaScript</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;A antevisão para este tipo de ficheiro não está disponível.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation>Antevisão - {0}</translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation>Antevisão - {0}</translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation>Antevisão</translation>
     </message>
@@ -74840,6 +74905,14 @@
     </message>
 </context>
 <context>
+    <name>_StrikeThroughExtension</name>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="574"/>
+        <source>Export source</source>
+        <translation type="obsolete">Exportar fonte</translation>
+    </message>
+</context>
+<context>
     <name>eric6</name>
     <message>
         <location filename="../eric6.py" line="350"/>
--- a/i18n/eric6_ru.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_ru.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11136,22 +11136,22 @@
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation>Добавить фильтр файлов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation>Фильтр для сохранения файлов может содержать только один шаблон.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation>Фильтр для файлов должен содержать по крайней мере один шаблон.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation>Введите фильтр для файлов:</translation>
     </message>
@@ -11168,53 +11168,103 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
         <source>Extensions of HTML files:</source>
-        <translation>Расширения HTML-файлов:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <translation type="obsolete">Расширения HTML-файлов:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation>Задайте расширения HTML-файлов для просмотра (разделённые пробелом)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
         <source>Extensions of Markdown files:</source>
-        <translation>Расширения Markdown-файлов:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <translation type="obsolete">Расширения Markdown-файлов:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation>Задайте расширения Markdown-файлов для просмотра (разделённые пробелом)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
         <source>Extensions of ReST files:</source>
-        <translation>Расширения ReST-файлов:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <translation type="obsolete">Расширения ReST-файлов:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation>Задайте расширения ReStructuredText-файлов для просмотра (разделённые пробелом)</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
         <source>Extensions of QSS files:</source>
-        <translation>Расширения QSS-файлов:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <translation type="obsolete">Расширения QSS-файлов:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation>Задайте расширения Qt Stylesheet-файлов для просмотра (разделённые пробелом)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation>Разрешить использовать &apos;sphinx&apos; для генерации просмотра ReST</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation>Использовать &apos;sphinx&apos; для просмотра ReST</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -15042,20 +15092,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML файлы (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>Экспортировать исходник</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно экспортировать источник в файл &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Для предварительного просмотра ReStructuredText файлов необходим пакет &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Установите его с помощью менеджера пакетов, &apos;pip install docutils&apos; или ознакомьтесь со страницей &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -40208,27 +40273,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Задайте интерпретатор Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Задайте интерпретатор Python{0}:</translation>
     </message>
@@ -40249,22 +40314,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Предварительный просмотр не доступен для этого типа файла.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Для предварительного просмотра ReStructuredText файлов необходим пакет &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Установите его с помощью менеджера пакетов, &apos;pip install docutils&apos; или ознакомьтесь со страницей &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Для предварительного просмотра ReStructuredText файлов необходим пакет &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Установите его с помощью менеджера пакетов,&apos;pip install Sphinx&apos; или ознакомьтесь со срраницей &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;В качестве альтернативы можете запретить использование Sphinx во вкладке Редактор, страница Настройка режима работы с файлами.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Для предварительного просмотра Markdown файлов необходим пакет &lt;b&gt;python-markdown&lt;/b&gt;.&lt;br/&gt;Установите его с помощью команды &apos;pip install docutils&apos; вашего менеджера пакетов или ознакомьтесь с инструкцией &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
@@ -40272,37 +40337,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation>Разрешить JavaScript для предварительного просмотра HTML файлов</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation>Использовать JavaScript</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation>Разрешить поддержку Server Side Includes</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation>Разрешить Server Side Includes</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Предварительный просмотр не доступен для этого типа файла.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation>Предварительный просмотр - {0}</translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation>Предварительный просмотр - {0}</translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation>Предварительный просмотр</translation>
     </message>
@@ -73654,6 +73719,19 @@
     </message>
 </context>
 <context>
+    <name>_StrikeThroughExtension</name>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="574"/>
+        <source>Export source</source>
+        <translation type="obsolete">Экспортировать исходник</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="574"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;Для предварительного просмотра ReStructuredText файлов необходим пакет &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Установите его с помощью менеджера пакетов, &apos;pip install docutils&apos; или ознакомьтесь со страницей &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;.&lt;/a&gt;&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>eric6</name>
     <message>
         <location filename="../eric6.py" line="350"/>
--- a/i18n/eric6_tr.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_tr.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11414,22 +11414,22 @@
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11444,55 +11444,85 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
-        <source>Extensions of HTML files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
-        <source>Extensions of Markdown files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
-        <source>Extensions of ReST files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
-        <source>Extensions of QSS files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -15386,20 +15416,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML Dosyaları (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>Kaynağı dışaktar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kaynak &lt;b&gt;{0}&lt;/b&gt;na ihraç edilemiyor.&lt;/p&gt;&lt;p&gt;Sebep: {1}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -40862,27 +40907,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40903,22 +40948,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40926,37 +40971,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation type="unfinished">Javabetiğini etkinleştir</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74353,6 +74398,14 @@
     </message>
 </context>
 <context>
+    <name>_StrikeThroughExtension</name>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="574"/>
+        <source>Export source</source>
+        <translation type="obsolete">Kaynağı dışaktar</translation>
+    </message>
+</context>
+<context>
     <name>eric6</name>
     <message>
         <location filename="../eric6.py" line="350"/>
--- a/i18n/eric6_zh_CN.ts	Mon Aug 07 12:19:34 2017 +0200
+++ b/i18n/eric6_zh_CN.ts	Mon Aug 07 18:00:51 2017 +0200
@@ -11409,22 +11409,22 @@
         <translation type="unfinished">删除</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Add File Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="237"/>
         <source>A Save File Filter must contain exactly one wildcard pattern. Yours contains {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="246"/>
         <source>A File Filter must contain at least one wildcard pattern.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="277"/>
         <source>Enter the file filter entry:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11439,55 +11439,85 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
-        <source>Extensions of HTML files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="464"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
-        <source>Extensions of Markdown files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="487"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
-        <source>Extensions of ReST files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="540"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="493"/>
-        <source>Extensions of QSS files:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="500"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="602"/>
         <source>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="507"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="547"/>
         <source>Select to use &apos;sphinx&apos; to generate the ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="550"/>
         <source>Use &apos;sphinx&apos; for ReST preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
+        <source>HTML Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="595"/>
+        <source>Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="474"/>
+        <source>Markdown Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="494"/>
+        <source>Select this to convert a new line character to an HTML &lt;br/&gt; tag.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="497"/>
+        <source>Convert New Line to HTML Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="563"/>
+        <source>HTML Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="576"/>
+        <source>Select the HTML format to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="527"/>
+        <source>ReST Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="557"/>
+        <source>Docutils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="589"/>
+        <source>QSS Files</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorGeneralPage</name>
@@ -15408,20 +15438,35 @@
 <context>
     <name>ExporterHTML</name>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="376"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="382"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML 文件 (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
         <source>Export source</source>
         <translation>导出源代码</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="411"/>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="436"/>
         <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/>
+        <source>&lt;p&gt;The source could not be exported to &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Reason: No HTML code generated.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/>
+        <source>&lt;p&gt;Markdown export requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt; installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/>
+        <source>&lt;p&gt;ReStructuredText export requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExporterODT</name>
@@ -40859,27 +40904,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1587"/>
+        <location filename="../Preferences/__init__.py" line="1590"/>
         <source>Export Preferences</source>
         <translation>导出首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Import Preferences</source>
         <translation>导入首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1615"/>
+        <location filename="../Preferences/__init__.py" line="1618"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>属性文件 (*.ini);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select Python{0} Interpreter</source>
         <translation>选择 Python{0} 解释器</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1717"/>
+        <location filename="../Preferences/__init__.py" line="1720"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>选择要使用的 Python{0} 解释器：</translation>
     </message>
@@ -40900,22 +40945,22 @@
 <context>
     <name>PreviewProcessingThread</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="436"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="461"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="568"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;sphinx&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager,&apos;pip install Sphinx&apos; or see &lt;a href=&quot;http://pypi.python.org/pypi/Sphinx&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="593"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager, &apos;pip install docutils&apos; or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40923,37 +40968,37 @@
 <context>
     <name>PreviewerHTML</name>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="76"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
         <source>Select to enable JavaScript for HTML previews</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="75"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="74"/>
         <source>Enable JavaScript</source>
         <translation>允许 JavaScript</translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="82"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="81"/>
         <source>Select to enable support for Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="80"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="79"/>
         <source>Enable Server Side Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/>
-        <source>Preview - {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/>
+        <source>Preview - {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/Previewers/PreviewerHTML.py" line="234"/>
         <source>Preview</source>
         <translation>预览</translation>
     </message>
@@ -74594,6 +74639,14 @@
     </message>
 </context>
 <context>
+    <name>_StrikeThroughExtension</name>
+    <message>
+        <location filename="../QScintilla/Exporters/ExporterHTML.py" line="574"/>
+        <source>Export source</source>
+        <translation type="obsolete">导出源代码</translation>
+    </message>
+</context>
+<context>
     <name>eric6</name>
     <message>
         <location filename="../eric6.py" line="350"/>
APIs/Python3/eric6.api		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qch		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qhp		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.QScintilla.Exporters.ExporterHTML.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html		file \| annotate \| diff \| comparison \| revisions
Preferences/ConfigurationPages/EditorFilePage.py		file \| annotate \| diff \| comparison \| revisions
Preferences/ConfigurationPages/EditorFilePage.ui		file \| annotate \| diff \| comparison \| revisions
Preferences/__init__.py		file \| annotate \| diff \| comparison \| revisions
QScintilla/Exporters/ExporterHTML.py		file \| annotate \| diff \| comparison \| revisions
UI/Previewers/PreviewerHTML.py		file \| annotate \| diff \| comparison \| revisions
changelog		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_cs.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_de.qm		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_de.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_empty.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_en.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_es.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_fr.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_it.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_pt.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_ru.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_tr.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_zh_CN.ts		file \| annotate \| diff \| comparison \| revisions