diff -r 159e6057ad34 -r 9ef6a28f1694 i18n/eric6_empty.ts --- 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 'sphinx' 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 'sphinx' 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 <br/> 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><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Exporters/ExporterHTML.py" line="445"/> + <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: No HTML code generated.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/> + <source><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></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Exporters/ExporterHTML.py" line="472"/> + <source><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></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><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="513"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="540"/> <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="568"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="596"/> <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="593"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="624"/> <source><p>Markdown preview 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></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><p>No preview available for this type of file.</p></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>