Sun, 21 Dec 2014 15:36:59 +0100
Added capability to use 'Sphinx' to preview ReST files.
--- a/APIs/Python3/eric6.api Sat Dec 20 19:16:41 2014 +0100 +++ b/APIs/Python3/eric6.api Sun Dec 21 15:36:59 2014 +0100 @@ -8223,8 +8223,11 @@ eric6.UI.Previewer.Previewer.show?4() eric6.UI.Previewer.Previewer.shutdown?4() eric6.UI.Previewer.Previewer?1(viewmanager, splitter, parent=None) +eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.DefaultStaticPath?7 +eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.StaticRegexp?7 eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.htmlReady?7 -eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.process?4(filePath, language, text, ssiEnabled, rootPath) +eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.process?4(filePath, language, text, ssiEnabled, rootPath, useSphinx) +eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.replace?4() 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)
--- a/Documentation/Help/source.qhp Sat Dec 20 19:16:41 2014 +0100 +++ b/Documentation/Help/source.qhp Sun Dec 21 15:36:59 2014 +0100 @@ -8607,9 +8607,12 @@ <keyword name="PreviewProcessingThread (Constructor)" id="PreviewProcessingThread (Constructor)" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__init__" /> <keyword name="PreviewProcessingThread.__convertMarkdown" id="PreviewProcessingThread.__convertMarkdown" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__convertMarkdown" /> <keyword name="PreviewProcessingThread.__convertReST" id="PreviewProcessingThread.__convertReST" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__convertReST" /> + <keyword name="PreviewProcessingThread.__convertReSTDocutils" id="PreviewProcessingThread.__convertReSTDocutils" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__convertReSTDocutils" /> + <keyword name="PreviewProcessingThread.__convertReSTSphinx" id="PreviewProcessingThread.__convertReSTSphinx" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__convertReSTSphinx" /> <keyword name="PreviewProcessingThread.__getHtml" id="PreviewProcessingThread.__getHtml" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__getHtml" /> <keyword name="PreviewProcessingThread.__processSSI" id="PreviewProcessingThread.__processSSI" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__processSSI" /> <keyword name="PreviewProcessingThread.process" id="PreviewProcessingThread.process" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.process" /> + <keyword name="PreviewProcessingThread.replace" id="PreviewProcessingThread.replace" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.replace" /> <keyword name="PreviewProcessingThread.run" id="PreviewProcessingThread.run" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.run" /> <keyword name="Previewer" id="Previewer" ref="eric6.UI.Previewer.html#Previewer" /> <keyword name="Previewer (Constructor)" id="Previewer (Constructor)" ref="eric6.UI.Previewer.html#Previewer.__init__" />
--- a/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html Sat Dec 20 19:16:41 2014 +0100 +++ b/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html Sun Dec 21 15:36:59 2014 +0100 @@ -62,7 +62,7 @@ QThread <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>DefaultStaticPath</td></tr><tr><td>StaticRegexp</td></tr> </table> <h3>Class Methods</h3> <table> @@ -80,6 +80,12 @@ <td><a href="#PreviewProcessingThread.__convertReST">__convertReST</a></td> <td>Private method to convert ReST text into HTML.</td> </tr><tr> +<td><a href="#PreviewProcessingThread.__convertReSTDocutils">__convertReSTDocutils</a></td> +<td>Private method to convert ReST text into HTML using 'docutils'.</td> +</tr><tr> +<td><a href="#PreviewProcessingThread.__convertReSTSphinx">__convertReSTSphinx</a></td> +<td>Private method to convert ReST text into HTML using 'sphinx'.</td> +</tr><tr> <td><a href="#PreviewProcessingThread.__getHtml">__getHtml</a></td> <td>Private method to process the given text depending upon the given language.</td> </tr><tr> @@ -89,6 +95,9 @@ <td><a href="#PreviewProcessingThread.process">process</a></td> <td>Public method to convert the given text to HTML.</td> </tr><tr> +<td><a href="#PreviewProcessingThread.replace">replace</a></td> +<td></td> +</tr><tr> <td><a href="#PreviewProcessingThread.run">run</a></td> <td>Public thread method to convert the stored data.</td> </tr> @@ -124,13 +133,47 @@ </dd> </dl><a NAME="PreviewProcessingThread.__convertReST" ID="PreviewProcessingThread.__convertReST"></a> <h4>PreviewProcessingThread.__convertReST</h4> -<b>__convertReST</b>(<i>text</i>) +<b>__convertReST</b>(<i>text, useSphinx</i>) <p> Private method to convert ReST text into HTML. </p><dl> <dt><i>text</i></dt> <dd> text to be processed (string) +</dd><dt><i>useSphinx</i></dt> +<dd> +flag indicating to use Sphinx to generate the + ReST preview (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +processed HTML (string) +</dd> +</dl><a NAME="PreviewProcessingThread.__convertReSTDocutils" ID="PreviewProcessingThread.__convertReSTDocutils"></a> +<h4>PreviewProcessingThread.__convertReSTDocutils</h4> +<b>__convertReSTDocutils</b>(<i>text</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> +</dl><dl> +<dt>Returns:</dt> +<dd> +processed HTML (string) +</dd> +</dl><a NAME="PreviewProcessingThread.__convertReSTSphinx" ID="PreviewProcessingThread.__convertReSTSphinx"></a> +<h4>PreviewProcessingThread.__convertReSTSphinx</h4> +<b>__convertReSTSphinx</b>(<i>text</i>) +<p> + Private method to convert ReST text into HTML using 'sphinx'. +</p><dl> +<dt><i>text</i></dt> +<dd> +text to be processed (string) </dd> </dl><dl> <dt>Returns:</dt> @@ -139,7 +182,7 @@ </dd> </dl><a NAME="PreviewProcessingThread.__getHtml" ID="PreviewProcessingThread.__getHtml"></a> <h4>PreviewProcessingThread.__getHtml</h4> -<b>__getHtml</b>(<i>language, text, ssiEnabled, filePath, rootPath</i>) +<b>__getHtml</b>(<i>language, text, ssiEnabled, filePath, rootPath, useSphinx</i>) <p> Private method to process the given text depending upon the given language. @@ -160,6 +203,10 @@ </dd><dt><i>rootPath</i></dt> <dd> root path to be used for SSI processing (str) +</dd><dt><i>useSphinx</i></dt> +<dd> +flag indicating to use Sphinx to generate the + ReST preview (boolean) </dd> </dl><dl> <dt>Returns:</dt> @@ -192,7 +239,7 @@ </dd> </dl><a NAME="PreviewProcessingThread.process" ID="PreviewProcessingThread.process"></a> <h4>PreviewProcessingThread.process</h4> -<b>process</b>(<i>filePath, language, text, ssiEnabled, rootPath</i>) +<b>process</b>(<i>filePath, language, text, ssiEnabled, rootPath, useSphinx</i>) <p> Public method to convert the given text to HTML. </p><dl> @@ -212,8 +259,15 @@ </dd><dt><i>rootPath</i></dt> <dd> root path to be used for SSI processing (str) +</dd><dt><i>useSphinx</i></dt> +<dd> +flag indicating to use Sphinx to generate the + ReST preview (boolean) </dd> -</dl><a NAME="PreviewProcessingThread.run" ID="PreviewProcessingThread.run"></a> +</dl><a NAME="PreviewProcessingThread.replace" ID="PreviewProcessingThread.replace"></a> +<h4>PreviewProcessingThread.replace</h4> +<b>replace</b>(<i></i>) +<a NAME="PreviewProcessingThread.run" ID="PreviewProcessingThread.run"></a> <h4>PreviewProcessingThread.run</h4> <b>run</b>(<i></i>) <p>
--- a/Preferences/ConfigurationPages/EditorFilePage.py Sat Dec 20 19:16:41 2014 +0100 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Sun Dec 21 15:36:59 2014 +0100 @@ -89,6 +89,8 @@ " ".join(Preferences.getEditor("PreviewRestFileNameExtensions"))) self.previewQssExtensionsEdit.setText( " ".join(Preferences.getEditor("PreviewQssFileNameExtensions"))) + self.previewRestSphinxCheckBox.setChecked( + Preferences.getEditor("PreviewRestUseSphinx")) def save(self): """ @@ -156,6 +158,9 @@ "PreviewQssFileNameExtensions", [ext.strip() for ext in self.previewQssExtensionsEdit.text().split()]) + Preferences.setEditor( + "PreviewRestUseSphinx", + self.previewRestSphinxCheckBox.isChecked()) def __setDefaultFiltersLists(self, keepSelection=False): """
--- a/Preferences/ConfigurationPages/EditorFilePage.ui Sat Dec 20 19:16:41 2014 +0100 +++ b/Preferences/ConfigurationPages/EditorFilePage.ui Sun Dec 21 15:36:59 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>600</width> - <height>1032</height> + <height>1193</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> @@ -501,6 +501,16 @@ </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> + </widget> + </item> </layout> </widget> </item>
--- a/Preferences/__init__.py Sat Dec 20 19:16:41 2014 +0100 +++ b/Preferences/__init__.py Sun Dec 21 15:36:59 2014 +0100 @@ -336,6 +336,7 @@ "PreviewMarkdownFileNameExtensions": ["md", "markdown"], "PreviewRestFileNameExtensions": ["rst"], "PreviewQssFileNameExtensions": ["qss"], + "PreviewRestUseSphinx": False, "VirtualSpaceOptions": QsciScintilla.SCVS_NONE,
--- a/UI/Previewers/PreviewerHTML.py Sat Dec 20 19:16:41 2014 +0100 +++ b/UI/Previewers/PreviewerHTML.py Sun Dec 21 15:36:59 2014 +0100 @@ -9,9 +9,17 @@ from __future__ import unicode_literals +try: # Only for Py2 + import StringIO as io # __IGNORE_EXCEPTION__ +except ImportError: + import io # __IGNORE_WARNING__ + import os import threading import re +import shutil +import tempfile +import sys from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QSize, QThread from PyQt5.QtWidgets import QWidget @@ -139,7 +147,8 @@ self.__processingThread.process( fn, language, editor.text(), - self.ssiCheckBox.isChecked(), rootPath) + self.ssiCheckBox.isChecked(), rootPath, + Preferences.getEditor("PreviewRestUseSphinx")) def __setHtml(self, filePath, html): """ @@ -229,6 +238,11 @@ """ htmlReady = pyqtSignal(str, str) + DefaultStaticPath = os.path.join( + os.path.abspath(os.path.dirname(__file__)), 'sphinx_default') + StaticRegexp = re.compile(r'(src|href)=["\']_static([\s\w/\.]+?)["\']', + re.IGNORECASE) + def __init__(self, parent=None): """ Constructor @@ -239,7 +253,8 @@ self.__lock = threading.Lock() - def process(self, filePath, language, text, ssiEnabled, rootPath): + def process(self, filePath, language, text, ssiEnabled, rootPath, + useSphinx): """ Public method to convert the given text to HTML. @@ -249,6 +264,8 @@ @param ssiEnabled flag indicating to do some (limited) SSI processing (boolean) @param rootPath root path to be used for SSI processing (str) + @param useSphinx flag indicating to use Sphinx to generate the + ReST preview (boolean) """ with self.__lock: self.__filePath = filePath @@ -257,6 +274,7 @@ self.__ssiEnabled = ssiEnabled self.__rootPath = rootPath self.__haveData = True + self.__useSphinx = useSphinx if not self.isRunning(): self.start(QThread.LowPriority) @@ -272,10 +290,11 @@ text = self.__text ssiEnabled = self.__ssiEnabled rootPath = self.__rootPath + useSphinx = self.__useSphinx self.__haveData = False html = self.__getHtml(language, text, ssiEnabled, filePath, - rootPath) + rootPath, useSphinx) with self.__lock: if not self.__haveData: @@ -283,7 +302,8 @@ break # else - next iteration - def __getHtml(self, language, text, ssiEnabled, filePath, rootPath): + def __getHtml(self, language, text, ssiEnabled, filePath, rootPath, + useSphinx): """ Private method to process the given text depending upon the given language. @@ -294,6 +314,8 @@ (boolean) @param filePath file path of the text (string) @param rootPath root path to be used for SSI processing (str) + @param useSphinx flag indicating to use Sphinx to generate the + ReST preview (boolean) @return processed HTML text (string) """ if language == "HTML": @@ -304,7 +326,7 @@ elif language == "Markdown": return self.__convertMarkdown(text) elif language == "ReST": - return self.__convertReST(text) + return self.__convertReST(text, useSphinx) else: return self.tr( "<p>No preview available for this type of file.</p>") @@ -356,20 +378,96 @@ return txt - def __convertReST(self, text): + def __convertReST(self, text, useSphinx): """ 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) + @return processed HTML (string) + """ + if useSphinx: + return self.__convertReSTSphinx(text) + else: + return self.__convertReSTDocutils(text) + + def __convertReSTSphinx(self, text): + """ + Private method to convert ReST text into HTML using 'sphinx'. + + @param text text to be processed (string) @return processed HTML (string) """ try: - import docutils.core # __IGNORE_EXCEPTION__ __IGNORE_WARNING__ + from sphinx.application import Sphinx # __IGNORE_EXCEPTION__ + except ImportError: + return self.tr( + """<p>ReStructuredText preview requires the""" + """ <b>sphinx</b> package.<br/>Install it with""" + """ your package manager,'pip install Sphinx' or see""" + """ <a href="http://pypi.python.org/pypi/Sphinx">""" + """this page.</a></p>""" + """<p>Alternatively you may disable Sphinx usage""" + """ on the Editor, Filehandling configuration page.</p>""") + + tempDir = tempfile.mkdtemp(prefix='eric-rest-') + try: + filename = 'sphinx_preview' + basePath = os.path.join(tempDir, filename) + fh = open(basePath + '.rst', 'w', encoding='utf-8') + fh.write(text) + fh.close() + + overrides = {'html_add_permalinks': False, + 'html_copy_source': False, + 'html_title': 'Sphinx preview', + 'html_use_index': False, + 'html_use_modindex': False, + 'html_use_smartypants': True, + 'master_doc': filename } + app = Sphinx(srcdir=tempDir, confdir=None, outdir=tempDir, + doctreedir=tempDir, buildername='html', + confoverrides=overrides, status=None, + warning=io.StringIO()) + app.build(force_all=True, filenames=None) + + fh = open(basePath + '.html', 'r', encoding='utf-8') + html = fh.read() + fh.close() + finally: + shutil.rmtree(tempDir) + + # Replace the "_static/..." references inserted by Sphinx with absolute + # links to the specified DefaultStaticPath replacement. + def replace(m): + return '{0}="file://{1}{2}"'.format( + m.group(1), self.DefaultStaticPath, m.group(2)) + html = re.sub(self.StaticRegexp, replace, html) + + return html + + def __convertReSTDocutils(self, text): + """ + Private method to convert ReST text into HTML using 'docutils'. + + @param text text to be processed (string) + @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: return self.tr( """<p>ReStructuredText preview requires the""" """ <b>python-docutils</b> package.<br/>Install it with""" - """ your package manager or see""" + """ your package manager, 'pip install docutils' or see""" """ <a href="http://pypi.python.org/pypi/docutils">""" """this page.</a></p>""") @@ -384,7 +482,7 @@ @return processed HTML (string) """ try: - import markdown # __IGNORE_EXCEPTION__ __IGNORE_WARNING__ + import markdown # __IGNORE_EXCEPTION__ except ImportError: return self.tr( """<p>Markdown preview requires the <b>python-markdown</b> """
--- a/changelog Sat Dec 20 19:16:41 2014 +0100 +++ b/changelog Sun Dec 21 15:36:59 2014 +0100 @@ -2,6 +2,8 @@ ---------- Version 6.1-snapshot-2015mmdd: - bug fixes +- Previewers + -- added capability to use 'Sphinx' to preview ReST files Version 6.0.0: - bug fixes
--- a/i18n/eric6_cs.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_cs.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10155,22 +10155,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation type="unfinished"></translation> </message> @@ -10224,6 +10224,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35188,27 +35198,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -35229,20 +35239,25 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> - <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>PreviewerHTML</name> @@ -35272,17 +35287,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_de.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_de.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10187,22 +10187,22 @@ <translation>Löschen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation>Dateifilter hinzufügen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation>Gib den Dateifiltereintrag ein:</translation> </message> @@ -10256,6 +10256,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation>Auswählen, um 'sphinx' zur Erzeugung der ReST Vorschau zu verwenden</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation>'sphinx' für die ReST Vorschau verwenden</translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35274,27 +35284,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation>Wähle den Python{0}-Interpreter</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation> </message> @@ -35315,19 +35325,24 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation><p>Für diesen Dateityp ist keine Vorschau verfügbar.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation><p>Die Markdown-Vorschau erfordert das <b>python-markdown</b>-Paket.<br/>Installiere es mit dem Paketmanager oder siehe <a href="http://pythonhosted.org/Markdown/install.html">die Installationsanleitung.</a></p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> - <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation><p>Die ReStructuredText-Vorschau erfordert das <b>python-docutils</b>-Paket.<br/>Installiere es mit dem Paketmanager oder siehe <a href="http://pypi.python.org/pypi/docutils">diese Seite.</a></p></translation> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation><p>Die ReStructuredText-Vorschau erfordert das <b>python-docutils</b>-Paket.<br/>Installiere es mit dem Paketmanager,'pip install docutils' oder siehe <a href="http://pypi.python.org/pypi/docutils">diese Seite.</a></p></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation><p>Die ReStructuredText-Vorschau erfordert das <b>sphinx</b>-Paket.<br/>Installiere es mit dem Paketmanager,'pip install Sphinx' oder siehe <a href="http://pypi.python.org/pypi/Sphinx">diese Seite.</a></p><p>Alternativ kann die Verwendung von Sphinx auf der Konfigurationsseite Editor, Dateibehandlung deaktiviert werden.</p></translation> </message> </context> <context> @@ -35358,17 +35373,17 @@ <translation>Server Side Includes aktivieren</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation><p>Für diesen Dateityp ist keine Vorschau verfügbar.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation>Vorschau – {0}</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation>Vorschau</translation> </message>
--- a/i18n/eric6_en.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_en.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10100,22 +10100,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation type="unfinished"></translation> </message> @@ -10169,6 +10169,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35106,27 +35116,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -35147,20 +35157,25 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> - <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>PreviewerHTML</name> @@ -35190,17 +35205,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_es.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_es.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10184,22 +10184,22 @@ <translation>Borrar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation>Añadir Filtro de Archivo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation>Introducir la entrada para filtro de archivo:</translation> </message> @@ -10253,6 +10253,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35275,27 +35285,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation>Seleccionar intérprete de Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation> </message> @@ -35316,19 +35326,29 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation><p>No hay vista previa disponible para este tipo de archivo.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> - <translation><p>La previsualización de Markdown requiere el package <b>python-markdown</b>.<br/>Instalar con el gestor de paquetes o ver <a href="http://pythonhosted.org/Markdown/install.html">las instrucciones de instalación.</a></p></translation> + <translation type="unfinished"><p>La previsualización de Markdown requiere el package <b>python-markdown</b>.<br/>Instalar con el gestor de paquetes o ver <a href="http://pythonhosted.org/Markdown/install.html">las instrucciones de instalación.</a></p></translation> </message> <message> <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation><p>La previsualización de ReStructuredText requiere el package <b>python-docutils</b> package.<br/>Installar con el gestor de paquetes o ver <a href="http://pypi.python.org/pypi/docutils">esta página .</a></p></translation> + <translation type="obsolete"><p>La previsualización de ReStructuredText requiere el package <b>python-docutils</b> package.<br/>Installar con el gestor de paquetes o ver <a href="http://pypi.python.org/pypi/docutils">esta página .</a></p></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -35359,17 +35379,17 @@ <translation>Habilitar Includes del Lado del Servidor</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation><p>No hay vista previa disponible para este tipo de archivo.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation>Vista Previa - {0}</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation>Vista Previa</translation> </message>
--- a/i18n/eric6_fr.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_fr.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10161,22 +10161,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation type="unfinished"></translation> </message> @@ -10230,6 +10230,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35205,27 +35215,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -35246,20 +35256,25 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> - <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>PreviewerHTML</name> @@ -35289,17 +35304,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation type="unfinished">Aperçu</translation> </message>
--- a/i18n/eric6_it.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_it.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10178,22 +10178,22 @@ <translation>Cancella</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation>Aggiungi filtro file</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation>Inserisci il filtro file:</translation> </message> @@ -10247,6 +10247,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35246,27 +35256,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -35287,19 +35297,29 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation><p>Non è prevista la visualizzazione per questo tipo di flusso.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> - <translation><p>La visualizzazione Markdown richiede <b>il pacchetto</b> python-markdown.<br/>Intallarlo con il vostro gestore di pacchetti o vedere <a href="http://pythonhosted.org/Markdown/install.html"> per le istruzioni di installazione.</a></p></translation> + <translation type="unfinished"><p>La visualizzazione Markdown richiede <b>il pacchetto</b> python-markdown.<br/>Intallarlo con il vostro gestore di pacchetti o vedere <a href="http://pythonhosted.org/Markdown/install.html"> per le istruzioni di installazione.</a></p></translation> </message> <message> <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation><p>La visualizzazione ReStructuredText richiede <b>il pacchetto</b> python-docutils.<br/>Installarlo con il vostro gestore di pacchetti o vedere <a href="http://pypi.python.org/pypi/docutils"> questa pagina.</a></p></translation> + <translation type="obsolete"><p>La visualizzazione ReStructuredText richiede <b>il pacchetto</b> python-docutils.<br/>Installarlo con il vostro gestore di pacchetti o vedere <a href="http://pypi.python.org/pypi/docutils"> questa pagina.</a></p></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -35330,17 +35350,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"><p>Non è prevista la visualizzazione per questo tipo di flusso.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_pt.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_pt.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10520,22 +10520,22 @@ <translation>Apagar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation>Adicionar Filtro de Ficheiros</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation>Introduzir entrada do filtro de ficheiros:</translation> </message> @@ -10589,6 +10589,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35657,17 +35667,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> @@ -35682,12 +35692,12 @@ <translation type="obsolete">Selecionar o intérprete de Python2 a usar:</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -35708,20 +35718,25 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"><p>A antevisão para este tipo de ficheiro não está disponível.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> - <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>Previewer</name> @@ -35774,17 +35789,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"><p>A antevisão para este tipo de ficheiro não está disponível.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation type="unfinished">Antevisão - {0}</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation type="unfinished">Antevisão</translation> </message>
--- a/i18n/eric6_ru.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_ru.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10213,22 +10213,22 @@ <translation>Удалить</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation>Добавить фильтр файлов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <source>A File Filter must contain at least one wildcard pattern.</source> <translation>Фильтр для файлов должен содержать по крайней мере один шаблон.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation>Введите фильтр для файлов:</translation> </message> @@ -10282,6 +10282,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35366,27 +35376,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation>Задайте интерпретатор Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Задайте интерпретатор Python{0}:</translation> </message> @@ -35407,22 +35417,32 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation><p>Предварительный просмотр недоступен для этого типа файла.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> - <translation><p>Для предварительного просмотра Markdown файлов необходим пакет <b>python-markdown</b>. Установите его с помощью менеджера пакетов + <translation type="unfinished"><p>Для предварительного просмотра Markdown файлов необходим пакет <b>python-markdown</b>. Установите его с помощью менеджера пакетов или ознакомтесь с инструкцией по установке <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></translation> </message> <message> <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation><p>Для предварительного просмотра ReStructuredText файлов необходим пакет <b>python-docutils</b>. Установите его с помощью менеджера пакетов + <translation type="obsolete"><p>Для предварительного просмотра ReStructuredText файлов необходим пакет <b>python-docutils</b>. Установите его с помощью менеджера пакетов или ознакомтесь с инструкцией по установке <a href="http://pypi.python.org/pypi/docutils">installation instructions.</a></p></translation> </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PreviewerHTML</name> @@ -35452,17 +35472,17 @@ <translation>Разрешить Server Side Includes</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation><p>Предварительный просмотр недоступен для этого типа файла.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation>Предварительный просмотр - {0}</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation>Предварительный просмотр</translation> </message>
--- a/i18n/eric6_tr.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_tr.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10146,22 +10146,22 @@ <translation>Sil</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation type="unfinished"></translation> </message> @@ -10215,6 +10215,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35168,27 +35178,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -35209,20 +35219,25 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> - <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>PreviewerHTML</name> @@ -35252,17 +35267,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_zh_CN.GB2312.ts Sat Dec 20 19:16:41 2014 +0100 +++ b/i18n/eric6_zh_CN.GB2312.ts Sun Dec 21 15:36:59 2014 +0100 @@ -10127,22 +10127,22 @@ <translation type="unfinished">删除</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Add File Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="210"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="215"/> <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="219"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="224"/> <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="250"/> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.py" line="255"/> <source>Enter the file filter entry:</source> <translation type="unfinished"></translation> </message> @@ -10196,6 +10196,16 @@ <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"/> + <source>Select to use 'sphinx' to generate the ReST preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorFilePage.ui" line="510"/> + <source>Use 'sphinx' for ReST preview</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorGeneralPage</name> @@ -35138,27 +35148,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1181"/> + <location filename="../Preferences/__init__.py" line="1182"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1209"/> + <location filename="../Preferences/__init__.py" line="1210"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1311"/> + <location filename="../Preferences/__init__.py" line="1312"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -35179,20 +35189,25 @@ <context> <name>PreviewProcessingThread</name> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="311"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="333"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="394"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="472"/> + <source><p>ReStructuredText preview 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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="410"/> + <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="492"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> - <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>PreviewerHTML</name> @@ -35222,17 +35237,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="128"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="136"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="169"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="178"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="171"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="180"/> <source>Preview</source> <translation type="unfinished"></translation> </message>