Mercurial Repositories > eric / changeset

changeset

Corrected two strings to make them translatable.

Thu, 02 Nov 2017 16:50:06 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Thu, 02 Nov 2017 16:50:06 +0100
changeset 5942
8b083e33c51f
parent 5941
e8e33fb8dda1
child 5943
10ad861d21f2

Corrected two strings to make them translatable.

UI/CodeDocumentationViewerTemplate.py file | annotate | diff | comparison | revisions
i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
i18n/eric6_de.qm file | annotate | diff | comparison | revisions
i18n/eric6_de.ts file | annotate | diff | comparison | revisions
i18n/eric6_empty.ts file | annotate | diff | comparison | revisions
i18n/eric6_en.ts file | annotate | diff | comparison | revisions
i18n/eric6_es.ts file | annotate | diff | comparison | revisions
i18n/eric6_fr.ts file | annotate | diff | comparison | revisions
i18n/eric6_it.ts file | annotate | diff | comparison | revisions
i18n/eric6_pt.ts file | annotate | diff | comparison | revisions
i18n/eric6_ru.ts file | annotate | diff | comparison | revisions
i18n/eric6_tr.ts file | annotate | diff | comparison | revisions
i18n/eric6_zh_CN.ts file | annotate | diff | comparison | revisions 
--- a/UI/CodeDocumentationViewerTemplate.py	Thu Nov 02 11:19:20 2017 +0100
+++ b/UI/CodeDocumentationViewerTemplate.py	Thu Nov 02 16:50:06 2017 +0100
@@ -55,13 +55,15 @@
         </div>
     """
     
-    argspecTemplate = """
-        <p><b>Definition:</b> <span class="def">@NAME@@ARGSPEC@</span></p>
-    """
+    argspecTemplate = QCoreApplication.translate(
+        "CodeDocumentationViewer",
+        '<p><b>Definition:</b> <span class="def">@NAME@@ARGSPEC@</span></p>',
+        "Just translate 'Definition:' and leave the rest intact.")
     
-    noteTemplate = """
-        <p><b>Type:</b> @NOTE@</p>
-    """
+    noteTemplate = QCoreApplication.translate(
+        "CodeDocumentationViewer",
+        "<p><b>Note:</b> @NOTE@</p>",
+        "Just translate 'Note:' and leave the rest intact.")
     
     docstringTemplate = """
         <div class="docstring">
--- a/i18n/eric6_cs.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_cs.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3107,10 +3107,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -9930,7 +9942,7 @@
         <translation>Editovat breakpoint...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5284"/>
+        <location filename="../QScintilla/Editor.py" line="5290"/>
         <source>Enable breakpoint</source>
         <translation>Aktivovat breakpoint</translation>
     </message>
@@ -10030,187 +10042,187 @@
         <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5287"/>
+        <location filename="../QScintilla/Editor.py" line="5293"/>
         <source>Disable breakpoint</source>
         <translation>Deaktivovat breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Code Coverage</source>
         <translation>Pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Please select a coverage file</source>
         <translation>Prosím, vyberte soubor s pokrytím kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zobrazit poznámky pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5717"/>
+        <location filename="../QScintilla/Editor.py" line="5723"/>
         <source>All lines have been covered.</source>
         <translation>Všechny řádky byly pokryty.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>There is no coverage file available.</source>
         <translation>Soubor s pokrytím není dostupný.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Profile Data</source>
         <translation>Profilovat data</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Please select a profile file</source>
         <translation>Prosím, vyberte soubor s profilem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>Syntax Error</source>
         <translation>Chyba syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>No syntax error message available.</source>
         <translation>Hlášení syntaktické chyby není dostupné.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Macro Name</source>
         <translation>Název makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Select a macro name:</source>
         <translation>Vyberte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6342"/>
+        <location filename="../QScintilla/Editor.py" line="6348"/>
         <source>Load macro file</source>
         <translation>Načíst soubor makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Macro files (*.macro)</source>
         <translation>Macro soubory (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>Error loading macro</source>
         <translation>Chyba při načítání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Save macro file</source>
         <translation>Uložit soubor s makrem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>Save macro</source>
         <translation>Uložit makro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Error saving macro</source>
         <translation>Chyba při ukládání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Start Macro Recording</source>
         <translation>Spustit záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Nahrávání makra již probíhá. Spustit nové?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Macro Recording</source>
         <translation>Záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Enter name of the macro:</source>
         <translation>Vložte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6595"/>
+        <location filename="../QScintilla/Editor.py" line="6601"/>
         <source>File changed</source>
         <translation>Soubor změněn</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6920"/>
-        <source>Resources</source>
-        <translation>Zdroje</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6922"/>
-        <source>Add file...</source>
-        <translation>Přidat soubor...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6924"/>
-        <source>Add files...</source>
-        <translation>Přidat soubory...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6926"/>
+        <source>Resources</source>
+        <translation>Zdroje</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6928"/>
+        <source>Add file...</source>
+        <translation>Přidat soubor...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6930"/>
+        <source>Add files...</source>
+        <translation>Přidat soubory...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6932"/>
         <source>Add aliased file...</source>
         <translation>Přidat zástupce souboru...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6929"/>
+        <location filename="../QScintilla/Editor.py" line="6935"/>
         <source>Add localized resource...</source>
         <translation>Přidat lokalizované resource...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
+        <location filename="../QScintilla/Editor.py" line="6939"/>
         <source>Add resource frame</source>
         <translation>Přidat resource frame</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6952"/>
+        <location filename="../QScintilla/Editor.py" line="6958"/>
         <source>Add file resource</source>
         <translation>Přidat soubor resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6968"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resources</source>
         <translation>Přidat soubory resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Add aliased file resource</source>
         <translation>Přidat zástupce souboru resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Package Diagram</source>
         <translation>Diagram balíčku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Include class attributes?</source>
         <translation>Včetně atributů třídy?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Application Diagram</source>
         <translation>Diagram aplikace</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Include module names?</source>
         <translation>Včetně jmen modulů?</translation>
     </message>
@@ -10230,12 +10242,12 @@
         <translation>Nebyl zadán forám exportu. Zrušeno....</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Imports Diagram</source>
         <translation>Importovat diagram</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Include imports from external modules?</source>
         <translation>Zahrnout importy z externích modulů?</translation>
     </message>
@@ -10310,7 +10322,7 @@
         <translation>Použít Pygments lexer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7372"/>
+        <location filename="../QScintilla/Editor.py" line="7378"/>
         <source>Check spelling...</source>
         <translation>Zatrhnout kontrolu...</translation>
     </message>
@@ -10320,12 +10332,12 @@
         <translation>Zatrhnout výběr kontroly...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7375"/>
+        <location filename="../QScintilla/Editor.py" line="7381"/>
         <source>Add to dictionary</source>
         <translation>Přidat do slovníku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7377"/>
+        <location filename="../QScintilla/Editor.py" line="7383"/>
         <source>Ignore All</source>
         <translation>Ignorovat vše</translation>
     </message>
@@ -10365,32 +10377,32 @@
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6356"/>
+        <location filename="../QScintilla/Editor.py" line="6362"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; je poškozen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;So souboru s makrem &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6759"/>
+        <location filename="../QScintilla/Editor.py" line="6765"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Zástupce pro soubor &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
@@ -10420,22 +10432,22 @@
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6253"/>
+        <location filename="../QScintilla/Editor.py" line="6259"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6260"/>
+        <location filename="../QScintilla/Editor.py" line="6266"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6591"/>
+        <location filename="../QScintilla/Editor.py" line="6597"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10460,27 +10472,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>Warning</source>
         <translation type="unfinished">Varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6250"/>
+        <location filename="../QScintilla/Editor.py" line="6256"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10505,7 +10517,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6585"/>
+        <location filename="../QScintilla/Editor.py" line="6591"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; byl změněn po té co již byl načten do eric5. Znovu načíst?&lt;/p&gt; {0}?} {6.?}</translation>
     </message>
@@ -10530,22 +10542,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_de.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage="">
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -1957,8 +1958,8 @@
     </message>
     <message>
         <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/>
-        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>In neuem &amp;Register öffnen<byte value="x9"/>Strg+LMK</translation>
+        <source>Open in New &amp;Tab	Ctrl+LMB</source>
+        <translation>In neuem &amp;Register öffnen	Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="163"/>
@@ -1967,8 +1968,8 @@
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="166"/>
-        <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation>
+        <source>Open in New Tab	Ctrl+LMB</source>
+        <translation>In neuem Register öffnen	Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="169"/>
@@ -2056,8 +2057,8 @@
     </message>
     <message>
         <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/>
-        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>In neuem &amp;Register öffnen<byte value="x9"/>Strg+LMK</translation>
+        <source>Open in New &amp;Tab	Ctrl+LMB</source>
+        <translation>In neuem &amp;Register öffnen	Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="87"/>
@@ -2066,8 +2067,8 @@
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="90"/>
-        <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation>
+        <source>Open in New Tab	Ctrl+LMB</source>
+        <translation>In neuem Register öffnen	Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="93"/>
@@ -3048,10 +3049,22 @@
         <translation>Diese Funktion wurde deaktiviert.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation>Keine weitere Dokumentation verfügbar</translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation>&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt; @NOTE@&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -9425,7 +9438,7 @@
         <translation>Drucken abgebrochen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6595"/>
+        <location filename="../QScintilla/Editor.py" line="6601"/>
         <source>File changed</source>
         <translation>Datei geändert</translation>
     </message>
@@ -9490,57 +9503,57 @@
         <translation>Zurück zum letzten gesichert Zustand</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Macro Name</source>
         <translation>Makro Name</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Select a macro name:</source>
         <translation>Wähle einen Makro Namen:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Macro files (*.macro)</source>
         <translation>Makrodateien (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6342"/>
+        <location filename="../QScintilla/Editor.py" line="6348"/>
         <source>Load macro file</source>
         <translation>Lade Makrodatei</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>Error loading macro</source>
         <translation>Fehler beim Makro Laden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Save macro file</source>
         <translation>Makrodatei schreiben</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>Save macro</source>
         <translation>Makro speichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Error saving macro</source>
         <translation>Fehler beim Makro speichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Start Macro Recording</source>
         <translation>Makroaufzeichnung starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Macro Recording</source>
         <translation>Makroaufzeichnung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Enter name of the macro:</source>
         <translation>Gib einen Namen für das Makro ein:</translation>
     </message>
@@ -9600,32 +9613,32 @@
         <translation>Haltepunkt bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5284"/>
+        <location filename="../QScintilla/Editor.py" line="5290"/>
         <source>Enable breakpoint</source>
         <translation>Haltepunkt aktivieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5287"/>
+        <location filename="../QScintilla/Editor.py" line="5293"/>
         <source>Disable breakpoint</source>
         <translation>Haltepunkt deaktivieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Code Coverage</source>
         <translation>Quelltext Abdeckung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Please select a coverage file</source>
         <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Profile Data</source>
         <translation>Profildaten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Please select a profile file</source>
         <translation>Bitte wählen Sie eine Datei mit Profildaten</translation>
     </message>
@@ -9665,7 +9678,7 @@
         <translation>Autom. Speicherung aktiv</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>Drop Error</source>
         <translation>Drop Fehler</translation>
     </message>
@@ -9675,12 +9688,12 @@
         <translation>Zeige Syntaxfehlermeldung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>Syntax Error</source>
         <translation>Syntaxfehler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>No syntax error message available.</source>
         <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
     </message>
@@ -9710,17 +9723,17 @@
         <translation>Vorige nichtabgedeckte Zeile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zeilen ohne Abdeckung Markieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5717"/>
+        <location filename="../QScintilla/Editor.py" line="5723"/>
         <source>All lines have been covered.</source>
         <translation>Alle Zeilen sind abgedeckt.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>There is no coverage file available.</source>
         <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation>
     </message>
@@ -9730,22 +9743,22 @@
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; enthält ungesicherte Änderungen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6356"/>
+        <location filename="../QScintilla/Editor.py" line="6362"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; ist zerstört.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
     </message>
@@ -9785,82 +9798,82 @@
         <translation>Keine Sprache</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6759"/>
+        <location filename="../QScintilla/Editor.py" line="6765"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6920"/>
-        <source>Resources</source>
-        <translation>Ressourcen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6922"/>
-        <source>Add file...</source>
-        <translation>Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6924"/>
-        <source>Add files...</source>
-        <translation>Dateien hinzufügen...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6926"/>
+        <source>Resources</source>
+        <translation>Ressourcen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6928"/>
+        <source>Add file...</source>
+        <translation>Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6930"/>
+        <source>Add files...</source>
+        <translation>Dateien hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6932"/>
         <source>Add aliased file...</source>
         <translation>Aliased-Datei hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6929"/>
+        <location filename="../QScintilla/Editor.py" line="6935"/>
         <source>Add localized resource...</source>
         <translation>Lokalisierte Ressource hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6952"/>
+        <location filename="../QScintilla/Editor.py" line="6958"/>
         <source>Add file resource</source>
         <translation>Dateiressource hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6968"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resources</source>
         <translation>Dateiressourcen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Add aliased file resource</source>
         <translation>Aliased-Dateiressourcen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Alias für Datei &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Package Diagram</source>
         <translation>Package-Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Include class attributes?</source>
         <translation>Klassenattribute anzeigen?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Application Diagram</source>
         <translation>Applikations-Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Include module names?</source>
         <translation>Modulnamen anzeigen?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
+        <location filename="../QScintilla/Editor.py" line="6939"/>
         <source>Add resource frame</source>
         <translation>Ressourcenrahmen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation>
     </message>
@@ -9910,12 +9923,12 @@
         <translation>Kein Exportformat angegeben. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Imports Diagram</source>
         <translation>Imports Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Include imports from external modules?</source>
         <translation>Imports externer Module anzeigen?</translation>
     </message>
@@ -9990,7 +10003,7 @@
         <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7372"/>
+        <location filename="../QScintilla/Editor.py" line="7378"/>
         <source>Check spelling...</source>
         <translation>Rechtschreibprüfung...</translation>
     </message>
@@ -10000,12 +10013,12 @@
         <translation>Rechtschreibprüfung für Auswahl...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7375"/>
+        <location filename="../QScintilla/Editor.py" line="7381"/>
         <source>Add to dictionary</source>
         <translation>Zum Wörterbuch hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7377"/>
+        <location filename="../QScintilla/Editor.py" line="7383"/>
         <source>Ignore All</source>
         <translation>Alle ignorieren</translation>
     </message>
@@ -10050,22 +10063,22 @@
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makrodatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6253"/>
+        <location filename="../QScintilla/Editor.py" line="6259"/>
         <source>Warning: {0}</source>
         <translation>Warnung: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6260"/>
+        <location filename="../QScintilla/Editor.py" line="6266"/>
         <source>Error: {0}</source>
         <translation>Fehler: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6591"/>
+        <location filename="../QScintilla/Editor.py" line="6597"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Warnung:&lt;/b&gt; Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation>
     </message>
@@ -10090,27 +10103,27 @@
         <translation>Vorherige Änderung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>Sort Lines</source>
         <translation>Zeilen sortieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>No warning messages available.</source>
         <translation>Keine Warnmeldungen verfügbar.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6250"/>
+        <location filename="../QScintilla/Editor.py" line="6256"/>
         <source>Style: {0}</source>
         <translation>Stil: {0}</translation>
     </message>
@@ -10135,7 +10148,7 @@
         <translation>Öffnen mit Kodierung</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6585"/>
+        <location filename="../QScintilla/Editor.py" line="6591"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?&lt;/p&gt;</translation>
     </message>
@@ -10160,22 +10173,22 @@
         <translation>Der Provider für automatische Vervollständigungen namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>Call-Tips Provider</source>
         <translation>Calltipps-Provider</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Calltipps-Provider namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>Register Mouse Click Handler</source>
         <translation>Maus Klick Handler registrieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Ein Maus Klick Handler für &quot;{0}&quot; wurde bereits durch &quot;{1}&quot; registriert. Die Anfrage durch &quot;{2}&quot; wird abgebrochen...</translation>
     </message>
@@ -17526,8 +17539,8 @@
     </message>
     <message>
         <location filename="../Helpviewer/HelpBrowserWV.py" line="1219"/>
-        <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation>
+        <source>Open Link in New Tab	Ctrl+LMB</source>
+        <translation>Link in neuem Fenster öffnen	Strg+LMK</translation>
     </message>
     <message>
         <location filename="../Helpviewer/HelpBrowserWV.py" line="1292"/>
@@ -71343,8 +71356,8 @@
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserView.py" line="618"/>
-        <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation>
+        <source>Open Link in New Tab	Ctrl+LMB</source>
+        <translation>Link in neuem Fenster öffnen	Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserView.py" line="622"/>
--- a/i18n/eric6_empty.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_empty.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3010,10 +3010,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -9296,7 +9308,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7372"/>
+        <location filename="../QScintilla/Editor.py" line="7378"/>
         <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9566,7 +9578,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5284"/>
+        <location filename="../QScintilla/Editor.py" line="5290"/>
         <source>Enable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9771,307 +9783,307 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5287"/>
+        <location filename="../QScintilla/Editor.py" line="5293"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5717"/>
+        <location filename="../QScintilla/Editor.py" line="5723"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6250"/>
+        <location filename="../QScintilla/Editor.py" line="6256"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6253"/>
+        <location filename="../QScintilla/Editor.py" line="6259"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6260"/>
+        <location filename="../QScintilla/Editor.py" line="6266"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6342"/>
+        <location filename="../QScintilla/Editor.py" line="6348"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6356"/>
+        <location filename="../QScintilla/Editor.py" line="6362"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6585"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6591"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6597"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6595"/>
+        <location filename="../QScintilla/Editor.py" line="6601"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6759"/>
+        <location filename="../QScintilla/Editor.py" line="6765"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6920"/>
-        <source>Resources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6922"/>
-        <source>Add file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6924"/>
-        <source>Add files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6926"/>
+        <source>Resources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6928"/>
+        <source>Add file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6930"/>
+        <source>Add files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6932"/>
         <source>Add aliased file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6929"/>
+        <location filename="../QScintilla/Editor.py" line="6935"/>
         <source>Add localized resource...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
+        <location filename="../QScintilla/Editor.py" line="6939"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6952"/>
+        <location filename="../QScintilla/Editor.py" line="6958"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6968"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7375"/>
+        <location filename="../QScintilla/Editor.py" line="7381"/>
         <source>Add to dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7377"/>
+        <location filename="../QScintilla/Editor.py" line="7383"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_en.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3010,10 +3010,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -9310,7 +9322,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7372"/>
+        <location filename="../QScintilla/Editor.py" line="7378"/>
         <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9535,7 +9547,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5284"/>
+        <location filename="../QScintilla/Editor.py" line="5290"/>
         <source>Enable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9720,257 +9732,257 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5287"/>
+        <location filename="../QScintilla/Editor.py" line="5293"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5717"/>
+        <location filename="../QScintilla/Editor.py" line="5723"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6342"/>
+        <location filename="../QScintilla/Editor.py" line="6348"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6356"/>
+        <location filename="../QScintilla/Editor.py" line="6362"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6595"/>
+        <location filename="../QScintilla/Editor.py" line="6601"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6759"/>
+        <location filename="../QScintilla/Editor.py" line="6765"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6920"/>
-        <source>Resources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6922"/>
-        <source>Add file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6924"/>
-        <source>Add files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6926"/>
+        <source>Resources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6928"/>
+        <source>Add file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6930"/>
+        <source>Add files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6932"/>
         <source>Add aliased file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6929"/>
+        <location filename="../QScintilla/Editor.py" line="6935"/>
         <source>Add localized resource...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
+        <location filename="../QScintilla/Editor.py" line="6939"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6952"/>
+        <location filename="../QScintilla/Editor.py" line="6958"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6968"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7375"/>
+        <location filename="../QScintilla/Editor.py" line="7381"/>
         <source>Add to dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7377"/>
+        <location filename="../QScintilla/Editor.py" line="7383"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6253"/>
+        <location filename="../QScintilla/Editor.py" line="6259"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6260"/>
+        <location filename="../QScintilla/Editor.py" line="6266"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6591"/>
+        <location filename="../QScintilla/Editor.py" line="6597"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9995,27 +10007,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6250"/>
+        <location filename="../QScintilla/Editor.py" line="6256"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10040,7 +10052,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6585"/>
+        <location filename="../QScintilla/Editor.py" line="6591"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10065,22 +10077,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_es.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3045,10 +3045,22 @@
         <translation>Esta función se ha deshabilitado.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation>No hay más documentación disponible</translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
--- a/i18n/eric6_fr.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_fr.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3123,10 +3123,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -9786,7 +9798,7 @@
         <translation>Éditer le point d&apos;arrêt...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5284"/>
+        <location filename="../QScintilla/Editor.py" line="5290"/>
         <source>Enable breakpoint</source>
         <translation>Activer le point d&apos;arrêt</translation>
     </message>
@@ -9871,87 +9883,87 @@
         <translation>L&apos;autocompletion n&apos;est pas disponible car aucune source d&apos;autocomplétion n&apos;est définie.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5287"/>
+        <location filename="../QScintilla/Editor.py" line="5293"/>
         <source>Disable breakpoint</source>
         <translation>Désactiver le point d&apos;arrêt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Code Coverage</source>
         <translation>Code Coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Please select a coverage file</source>
         <translation>Sélectionner un fichier coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Profile Data</source>
         <translation>Profiler de données</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Please select a profile file</source>
         <translation>Sélectionner un fichier profile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Macro Name</source>
         <translation>Nom de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Select a macro name:</source>
         <translation>Sélectionner un nom de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Macro files (*.macro)</source>
         <translation>Fichier Macro (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6342"/>
+        <location filename="../QScintilla/Editor.py" line="6348"/>
         <source>Load macro file</source>
         <translation>Charger un fichier macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>Error loading macro</source>
         <translation>Erreur lors du chargement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Save macro file</source>
         <translation>Enregistrer le fichier macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>Save macro</source>
         <translation>Enregistrer la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Error saving macro</source>
         <translation>Erreur lors de l&apos;enregistrement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Start Macro Recording</source>
         <translation>Démarrer l&apos;enregistrement de la macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Macro Recording</source>
         <translation>Enregistrement de macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Enter name of the macro:</source>
         <translation>Entrer le nom de la macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6595"/>
+        <location filename="../QScintilla/Editor.py" line="6601"/>
         <source>File changed</source>
         <translation>Fichier modifié</translation>
     </message>
@@ -9971,7 +9983,7 @@
         <translation>Supprimer les flags d&apos;erreurs de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>Drop Error</source>
         <translation>Erreur de suppression</translation>
     </message>
@@ -9981,12 +9993,12 @@
         <translation>Afficher le message d&apos;erreur de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>Syntax Error</source>
         <translation>Erreur de syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>No syntax error message available.</source>
         <translation>Aucun message d&apos;erreur de syntaxe..</translation>
     </message>
@@ -10016,17 +10028,17 @@
         <translation>Ligne non executée précédente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Afficher les annotations de Code Coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5717"/>
+        <location filename="../QScintilla/Editor.py" line="5723"/>
         <source>All lines have been covered.</source>
         <translation>Toutes les lignes ont été executées.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>There is no coverage file available.</source>
         <translation>Impossible de trouver le fichier de coverage.</translation>
     </message>
@@ -10061,72 +10073,72 @@
         <translation>Pas de langage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6920"/>
+        <location filename="../QScintilla/Editor.py" line="6926"/>
         <source>Resources</source>
         <translation>Ressources</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6922"/>
+        <location filename="../QScintilla/Editor.py" line="6928"/>
         <source>Add file...</source>
         <translation>Ajouter un fichier...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6924"/>
+        <location filename="../QScintilla/Editor.py" line="6930"/>
         <source>Add files...</source>
         <translation>Ajouter des fichiers...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6926"/>
+        <location filename="../QScintilla/Editor.py" line="6932"/>
         <source>Add aliased file...</source>
         <translation>Ajouter un fichier alias...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6929"/>
+        <location filename="../QScintilla/Editor.py" line="6935"/>
         <source>Add localized resource...</source>
         <translation>Ajouter une ressource localisée...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6952"/>
+        <location filename="../QScintilla/Editor.py" line="6958"/>
         <source>Add file resource</source>
         <translation>Ajoute un fichier ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6968"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resources</source>
         <translation>Ajoute des fichiers ressources</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Add aliased file resource</source>
         <translation>Ajoute un alias de fichier ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Package Diagram</source>
         <translation>Diagramme de package</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Include class attributes?</source>
         <translation>Inclure les attributs de classes ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Application Diagram</source>
         <translation>Diagramme de l&apos;application</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Include module names?</source>
         <translation>Inclure les noms de modules ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
+        <location filename="../QScintilla/Editor.py" line="6939"/>
         <source>Add resource frame</source>
         <translation>Ajouter un cadre ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>L&apos;enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation>
     </message>
@@ -10176,12 +10188,12 @@
         <translation>Aucun format d&apos;exportation indiqué. Abandon...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Imports Diagram</source>
         <translation>Diagramme des modules</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Include imports from external modules?</source>
         <translation>Inclure l&apos;importation de modules externes?</translation>
     </message>
@@ -10256,7 +10268,7 @@
         <translation>Sélectionne l&apos;analyseur Pygments à appliquer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7372"/>
+        <location filename="../QScintilla/Editor.py" line="7378"/>
         <source>Check spelling...</source>
         <translation>Correction orthographique...</translation>
     </message>
@@ -10266,12 +10278,12 @@
         <translation>Correction orthographique de la sélection...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7375"/>
+        <location filename="../QScintilla/Editor.py" line="7381"/>
         <source>Add to dictionary</source>
         <translation>Ajouter au dictionnaire</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7377"/>
+        <location filename="../QScintilla/Editor.py" line="7383"/>
         <source>Ignore All</source>
         <translation>Tout ignorer</translation>
     </message>
@@ -10311,32 +10323,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6356"/>
+        <location filename="../QScintilla/Editor.py" line="6362"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6759"/>
+        <location filename="../QScintilla/Editor.py" line="6765"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10366,22 +10378,22 @@
         <translation type="unfinished">&lt;p&gt;Le fichier &lt;b&gt;{0}&lt;/b&gt;existe déjà. Écraser ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6253"/>
+        <location filename="../QScintilla/Editor.py" line="6259"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6260"/>
+        <location filename="../QScintilla/Editor.py" line="6266"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6591"/>
+        <location filename="../QScintilla/Editor.py" line="6597"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10406,27 +10418,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>Warning</source>
         <translation type="unfinished">Warning</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6250"/>
+        <location filename="../QScintilla/Editor.py" line="6256"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10451,7 +10463,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6585"/>
+        <location filename="../QScintilla/Editor.py" line="6591"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10476,22 +10488,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_it.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3036,10 +3036,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -8900,7 +8912,7 @@
     <message>
         <location filename="../E5Gui/E5StringListEditWidget.ui" line="119"/>
         <source>R&amp;emove All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rimozione global&amp;e</translation>
     </message>
     <message>
         <location filename="../E5Gui/E5StringListEditWidget.py" line="89"/>
@@ -38436,7 +38448,7 @@
     <message>
         <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="113"/>
         <source>R&amp;emove All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rimozione global&amp;e</translation>
     </message>
     <message>
         <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
@@ -50737,7 +50749,7 @@
     <message>
         <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="113"/>
         <source>R&amp;emove All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rimozione global&amp;e</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
@@ -52721,7 +52733,7 @@
     <message>
         <location filename="../QScintilla/SpellingDictionaryEditDialog.ui" line="117"/>
         <source>R&amp;emove All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rimozione global&amp;e</translation>
     </message>
 </context>
 <context>
@@ -73065,7 +73077,7 @@
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2276"/>
         <source>&amp;Tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Tools</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2154"/>
--- a/i18n/eric6_pt.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_pt.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3137,10 +3137,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -9882,7 +9894,7 @@
         <translation>Desselecionar tudo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7372"/>
+        <location filename="../QScintilla/Editor.py" line="7378"/>
         <source>Check spelling...</source>
         <translation>Verificação ortográfica...</translation>
     </message>
@@ -10122,7 +10134,7 @@
         <translation>Editar ponto de interrupção...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5284"/>
+        <location filename="../QScintilla/Editor.py" line="5290"/>
         <source>Enable breakpoint</source>
         <translation>Habilitar pontos de interrupção</translation>
     </message>
@@ -10307,257 +10319,257 @@
         <translation>Autocompletar não está disponivel porque a fonte de autocompletar não está definida.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5287"/>
+        <location filename="../QScintilla/Editor.py" line="5293"/>
         <source>Disable breakpoint</source>
         <translation>Inabilitar ponto de interrupção</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5717"/>
+        <location filename="../QScintilla/Editor.py" line="5723"/>
         <source>All lines have been covered.</source>
         <translation>Foram cobertas as linhas todas.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Profile Data</source>
         <translation>Dados de Perfil</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Please select a profile file</source>
         <translation>Escolha um ficheiro de perfil por favor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>Syntax Error</source>
         <translation>Erro de Sintaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>No syntax error message available.</source>
         <translation>Não está disponível a mensagem de erro de sintaxe.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Macro Name</source>
         <translation>Nome de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Select a macro name:</source>
         <translation>Selecionar um nome de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6342"/>
+        <location filename="../QScintilla/Editor.py" line="6348"/>
         <source>Load macro file</source>
         <translation>Carregar ficheiro macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Macro files (*.macro)</source>
         <translation>Ficheiros Macro (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>Error loading macro</source>
         <translation>Erro ao carregar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6356"/>
+        <location filename="../QScintilla/Editor.py" line="6362"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; não se pode ler.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; está corrompido.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Save macro file</source>
         <translation>Gravar ficheiro macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>Save macro</source>
         <translation>Gravar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; já existe. Sobreescrever-lo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Error saving macro</source>
         <translation>Erro ao gravar macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro macro &lt;b&gt;{0}&lt;/b&gt; não pode ser escrito.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Start Macro Recording</source>
         <translation>Iniciar Registo de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>A gravação de macro já está ativada. Começar nova?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Macro Recording</source>
         <translation>Gravação de Macro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Enter name of the macro:</source>
         <translation>Introduza o nome de macro:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6595"/>
+        <location filename="../QScintilla/Editor.py" line="6601"/>
         <source>File changed</source>
         <translation>Ficheiro alterado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6759"/>
+        <location filename="../QScintilla/Editor.py" line="6765"/>
         <source>{0} (ro)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; não é um ficheiro.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6920"/>
-        <source>Resources</source>
-        <translation>Recursos</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6922"/>
-        <source>Add file...</source>
-        <translation>Adicionar Ficheiro...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6924"/>
-        <source>Add files...</source>
-        <translation>Adicionar Ficheiros...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6926"/>
+        <source>Resources</source>
+        <translation>Recursos</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6928"/>
+        <source>Add file...</source>
+        <translation>Adicionar Ficheiro...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6930"/>
+        <source>Add files...</source>
+        <translation>Adicionar Ficheiros...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6932"/>
         <source>Add aliased file...</source>
         <translation>Adicionar ficheiro com pseudónimo...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6929"/>
+        <location filename="../QScintilla/Editor.py" line="6935"/>
         <source>Add localized resource...</source>
         <translation>Adicionar recursos localizado...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
+        <location filename="../QScintilla/Editor.py" line="6939"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6952"/>
+        <location filename="../QScintilla/Editor.py" line="6958"/>
         <source>Add file resource</source>
         <translation>Adicionar recurso de ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6968"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resources</source>
         <translation>Adicionar recursos de ficheiro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Add aliased file resource</source>
         <translation>Adicionar recurso de ficheiro com pseudónimo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Pseudónimo para o ficheiro &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Package Diagram</source>
         <translation>Diagrama do Pacote</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Include class attributes?</source>
         <translation>Incluir atributos de classes?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Imports Diagram</source>
         <translation>Diagrama de Imports</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Include imports from external modules?</source>
         <translation>Incluir imports de módulos externos?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Application Diagram</source>
         <translation>Diagrama da Aplicação</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Include module names?</source>
         <translation>Incluir nome dos módulos?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7375"/>
+        <location filename="../QScintilla/Editor.py" line="7381"/>
         <source>Add to dictionary</source>
         <translation>Adicionar dicionário</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7377"/>
+        <location filename="../QScintilla/Editor.py" line="7383"/>
         <source>Ignore All</source>
         <translation>Ignorar Tudo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6253"/>
+        <location filename="../QScintilla/Editor.py" line="6259"/>
         <source>Warning: {0}</source>
         <translation>Aviso: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6260"/>
+        <location filename="../QScintilla/Editor.py" line="6266"/>
         <source>Error: {0}</source>
         <translation>Erro: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6591"/>
+        <location filename="../QScintilla/Editor.py" line="6597"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Aviso:&lt;/b&gt; Perderá todas as alterações uma vez que o volte a abrir.</translation>
     </message>
@@ -10602,27 +10614,27 @@
         <translation>Alteração anterior</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>Sort Lines</source>
         <translation>Ordenar Linhas</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation>A seleção contém dados ilegais para uma ordenação numérica.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>No warning messages available.</source>
         <translation>Não estão disponíveis mensagens de aviso.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6250"/>
+        <location filename="../QScintilla/Editor.py" line="6256"/>
         <source>Style: {0}</source>
         <translation>Estilo: {0}</translation>
     </message>
@@ -10647,7 +10659,7 @@
         <translation>Reabrir Com Codificação</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6585"/>
+        <location filename="../QScintilla/Editor.py" line="6591"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; foi alterado enquanto estava aberto em eric6. Recarregar?&lt;/p&gt;</translation>
     </message>
@@ -10672,22 +10684,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_ru.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_ru.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3047,10 +3047,22 @@
         <translation>Эта функция отключена.</translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation>Нет дополнительной документации</translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
--- a/i18n/eric6_tr.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_tr.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3106,10 +3106,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -9746,7 +9758,7 @@
         <translation>Tüm seçimi iptal et</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7372"/>
+        <location filename="../QScintilla/Editor.py" line="7378"/>
         <source>Check spelling...</source>
         <translation>Yazım Kontrolü...</translation>
     </message>
@@ -9986,7 +9998,7 @@
         <translation>Bekleme noktasını düzenle...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5284"/>
+        <location filename="../QScintilla/Editor.py" line="5290"/>
         <source>Enable breakpoint</source>
         <translation>Beklemenoktasını etkinleştir</translation>
     </message>
@@ -10166,237 +10178,237 @@
         <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5287"/>
+        <location filename="../QScintilla/Editor.py" line="5293"/>
         <source>Disable breakpoint</source>
         <translation>Durmanoktasını iptal et</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Code Coverage</source>
         <translation>Kod Koruyucu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Please select a coverage file</source>
         <translation>Lütfen bir koruyucu dosya seçiniz</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Kodların Dipnotunu Göster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5717"/>
+        <location filename="../QScintilla/Editor.py" line="5723"/>
         <source>All lines have been covered.</source>
         <translation>Tüm satırlar korumaya alındı.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>There is no coverage file available.</source>
         <translation>Hazırda koruma dosyası yok.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Profile Data</source>
         <translation>Veri Kesiti</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Please select a profile file</source>
         <translation>Lütfen kesit dosyasını seçiniz</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>Syntax Error</source>
         <translation>Sözdizimi Hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>No syntax error message available.</source>
         <translation>Uygun söz dizimi hata mesajı yok.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Macro Name</source>
         <translation>Makro Adı</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Select a macro name:</source>
         <translation>Bir makro ismi seç:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6342"/>
+        <location filename="../QScintilla/Editor.py" line="6348"/>
         <source>Load macro file</source>
         <translation>Makro dosyasını yükle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Macro files (*.macro)</source>
         <translation>Makro dosyaları (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>Error loading macro</source>
         <translation>Makronun yüklenmesinde hata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6356"/>
+        <location filename="../QScintilla/Editor.py" line="6362"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; okunamıyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; bozuk.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Save macro file</source>
         <translation>Makro Dosyasını Kaydet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>Save macro</source>
         <translation>Makro Kaydet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Error saving macro</source>
         <translation>Makronun kaydedilmesinde hata</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; yazılamıyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Start Macro Recording</source>
         <translation>Makro Kaydı Başladı</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Macro Recording</source>
         <translation>Makro Kaydediliyor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Enter name of the macro:</source>
         <translation>Makronun ismini gir:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6595"/>
+        <location filename="../QScintilla/Editor.py" line="6601"/>
         <source>File changed</source>
         <translation>Dosya değiştirilmiş</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6759"/>
+        <location filename="../QScintilla/Editor.py" line="6765"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>Drop Error</source>
         <translation>Düşme hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; bir dosya değil.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6920"/>
-        <source>Resources</source>
-        <translation>Kaynaklar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6922"/>
-        <source>Add file...</source>
-        <translation>Dosya ekle...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6924"/>
-        <source>Add files...</source>
-        <translation>Dosyaları ekle...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6926"/>
+        <source>Resources</source>
+        <translation>Kaynaklar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6928"/>
+        <source>Add file...</source>
+        <translation>Dosya ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6930"/>
+        <source>Add files...</source>
+        <translation>Dosyaları ekle...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6932"/>
         <source>Add aliased file...</source>
         <translation>Kısaltmalar dosyasına ekle...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6929"/>
+        <location filename="../QScintilla/Editor.py" line="6935"/>
         <source>Add localized resource...</source>
         <translation>Yaral kaynak ekle...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
+        <location filename="../QScintilla/Editor.py" line="6939"/>
         <source>Add resource frame</source>
         <translation>Çerçeve kaynağı ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6952"/>
+        <location filename="../QScintilla/Editor.py" line="6958"/>
         <source>Add file resource</source>
         <translation>Dosya kaynağını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6968"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resources</source>
         <translation>Dosya kaynaklarını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Add aliased file resource</source>
         <translation>Kısaltmalar dosyası kaynağını ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>&lt;b&gt;{0} dosyası için takma ad&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Package Diagram</source>
         <translation>Paket Şeması</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Include class attributes?</source>
         <translation>Sınıf nitelikleri dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Imports Diagram</source>
         <translation>Şemayı İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Include imports from external modules?</source>
         <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Application Diagram</source>
         <translation>Uygulama Şeması</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Include module names?</source>
         <translation>Modül isimleri dahil edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7375"/>
+        <location filename="../QScintilla/Editor.py" line="7381"/>
         <source>Add to dictionary</source>
         <translation>Sözlüğe ekle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7377"/>
+        <location filename="../QScintilla/Editor.py" line="7383"/>
         <source>Ignore All</source>
         <translation>Hepsini Yoksay</translation>
     </message>
@@ -10406,22 +10418,22 @@
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; dosyası halen mevcut. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6253"/>
+        <location filename="../QScintilla/Editor.py" line="6259"/>
         <source>Warning: {0}</source>
         <translation>Dikkat: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6260"/>
+        <location filename="../QScintilla/Editor.py" line="6266"/>
         <source>Error: {0}</source>
         <translation>Hata: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Makro dosyası &lt;b&gt;{0}&lt;/b&gt; zaten var. Üzerine yazılsın mı?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6591"/>
+        <location filename="../QScintilla/Editor.py" line="6597"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10446,27 +10458,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>Warning</source>
         <translation type="unfinished">Dikkat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6250"/>
+        <location filename="../QScintilla/Editor.py" line="6256"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10491,7 +10503,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6585"/>
+        <location filename="../QScintilla/Editor.py" line="6591"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Eric5 ile açıldıktan sonra &lt;b&gt;{0}&lt;/b&gt; dosyasında değişiklik olmuş. Yeniden açılsın mı?&lt;/p&gt; {0}?} {6.?}</translation>
     </message>
@@ -10516,22 +10528,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_zh_CN.ts	Thu Nov 02 11:19:20 2017 +0100
+++ b/i18n/eric6_zh_CN.ts	Thu Nov 02 16:50:06 2017 +0100
@@ -3114,10 +3114,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="119"/>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="121"/>
         <source>No further documentation available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="59"/>
+        <source>&lt;p&gt;&lt;b&gt;Definition:&lt;/b&gt; &lt;span class=&quot;def&quot;&gt;@NAME@@ARGSPEC@&lt;/span&gt;&lt;/p&gt;</source>
+        <comment>Just translate &apos;Definition:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/CodeDocumentationViewerTemplate.py" line="64"/>
+        <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; @NOTE@&lt;/p&gt;</source>
+        <comment>Just translate &apos;Note:&apos; and leave the rest intact.</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeMetricsDialog</name>
@@ -9736,7 +9748,7 @@
         <translation>全部取消选择</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7372"/>
+        <location filename="../QScintilla/Editor.py" line="7378"/>
         <source>Check spelling...</source>
         <translation>正在进行拼写检查…</translation>
     </message>
@@ -9971,7 +9983,7 @@
         <translation>编辑断点…</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5284"/>
+        <location filename="../QScintilla/Editor.py" line="5290"/>
         <source>Enable breakpoint</source>
         <translation>允许断点</translation>
     </message>
@@ -10106,207 +10118,207 @@
         <translation>自动完成无效，没有设定自动完成源。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5287"/>
+        <location filename="../QScintilla/Editor.py" line="5293"/>
         <source>Disable breakpoint</source>
         <translation>去除断点</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Code Coverage</source>
         <translation>代码覆盖率</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5661"/>
+        <location filename="../QScintilla/Editor.py" line="5667"/>
         <source>Please select a coverage file</source>
         <translation>请选择一个覆盖率文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>Show Code Coverage Annotations</source>
         <translation>显示代码覆盖率注解</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5717"/>
+        <location filename="../QScintilla/Editor.py" line="5723"/>
         <source>All lines have been covered.</source>
         <translation>所有行均被已覆盖。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5724"/>
+        <location filename="../QScintilla/Editor.py" line="5730"/>
         <source>There is no coverage file available.</source>
         <translation>没有有效的覆盖率文件。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Profile Data</source>
         <translation>剖析数据</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5839"/>
+        <location filename="../QScintilla/Editor.py" line="5845"/>
         <source>Please select a profile file</source>
         <translation>请选择一个剖析文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>Syntax Error</source>
         <translation>语法错误</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5999"/>
+        <location filename="../QScintilla/Editor.py" line="6005"/>
         <source>No syntax error message available.</source>
         <translation>语法错误消息无效。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Macro Name</source>
         <translation>宏名称</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6320"/>
         <source>Select a macro name:</source>
         <translation>选择一个宏名称：</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6342"/>
+        <location filename="../QScintilla/Editor.py" line="6348"/>
         <source>Load macro file</source>
         <translation>输入宏文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Macro files (*.macro)</source>
         <translation>宏文件 (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>Error loading macro</source>
         <translation>载入宏文件出错</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6391"/>
         <source>Save macro file</source>
         <translation>保存宏文件</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>Save macro</source>
         <translation>保存宏</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>Error saving macro</source>
         <translation>保存宏出错</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Start Macro Recording</source>
         <translation>开始宏录制</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6431"/>
+        <location filename="../QScintilla/Editor.py" line="6437"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>宏录制已激活。开始录制新宏？</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Macro Recording</source>
         <translation>宏录制</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6457"/>
+        <location filename="../QScintilla/Editor.py" line="6463"/>
         <source>Enter name of the macro:</source>
         <translation>输入宏名称：</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6595"/>
+        <location filename="../QScintilla/Editor.py" line="6601"/>
         <source>File changed</source>
         <translation>文件已改变</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>Drop Error</source>
         <translation>降落误差</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6920"/>
-        <source>Resources</source>
-        <translation>资源</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6922"/>
-        <source>Add file...</source>
-        <translation>添加文件…</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6924"/>
-        <source>Add files...</source>
-        <translation>添加文件…</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6926"/>
+        <source>Resources</source>
+        <translation>资源</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6928"/>
+        <source>Add file...</source>
+        <translation>添加文件…</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6930"/>
+        <source>Add files...</source>
+        <translation>添加文件…</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6932"/>
         <source>Add aliased file...</source>
         <translation>添加别名文件…</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6929"/>
+        <location filename="../QScintilla/Editor.py" line="6935"/>
         <source>Add localized resource...</source>
         <translation>添加本地资源…</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6933"/>
+        <location filename="../QScintilla/Editor.py" line="6939"/>
         <source>Add resource frame</source>
         <translation>添加资源结构</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6952"/>
+        <location filename="../QScintilla/Editor.py" line="6958"/>
         <source>Add file resource</source>
         <translation>添加文件资源</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6968"/>
+        <location filename="../QScintilla/Editor.py" line="6974"/>
         <source>Add file resources</source>
         <translation>添加多个文件资源</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Add aliased file resource</source>
         <translation>添加别名文件资源</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Package Diagram</source>
         <translation>程序包图</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7060"/>
+        <location filename="../QScintilla/Editor.py" line="7066"/>
         <source>Include class attributes?</source>
         <translation>包含类属性？</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Imports Diagram</source>
         <translation>引用图</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7080"/>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
         <source>Include imports from external modules?</source>
         <translation>从外部模块包含引用？</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Application Diagram</source>
         <translation>应用程序图</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7094"/>
+        <location filename="../QScintilla/Editor.py" line="7100"/>
         <source>Include module names?</source>
         <translation>包含模块名？</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7375"/>
+        <location filename="../QScintilla/Editor.py" line="7381"/>
         <source>Add to dictionary</source>
         <translation>添加到文件夹</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7377"/>
+        <location filename="../QScintilla/Editor.py" line="7383"/>
         <source>Ignore All</source>
         <translation>全部忽略</translation>
     </message>
@@ -10346,32 +10358,32 @@
         <translation>&lt;p&gt;文件 &lt;b&gt;{0}&lt;/b&gt; 无法保存。&lt;br /&gt;原因：{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6356"/>
+        <location filename="../QScintilla/Editor.py" line="6362"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6365"/>
+        <location filename="../QScintilla/Editor.py" line="6371"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6418"/>
+        <location filename="../QScintilla/Editor.py" line="6424"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6759"/>
+        <location filename="../QScintilla/Editor.py" line="6765"/>
         <source>{0} (ro)</source>
         <translation>{0}（只读）</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6899"/>
+        <location filename="../QScintilla/Editor.py" line="6905"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; 不是一个文件。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6996"/>
+        <location filename="../QScintilla/Editor.py" line="7002"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,22 +10413,22 @@
         <translation>&lt;p&gt;文件 &lt;b&gt;{0}&lt;/b&gt; 已经存在。是否覆盖？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6402"/>
+        <location filename="../QScintilla/Editor.py" line="6408"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;宏文件 &lt;b&gt;{0}&lt;/b&gt; 已经存在。是否覆盖？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6253"/>
+        <location filename="../QScintilla/Editor.py" line="6259"/>
         <source>Warning: {0}</source>
         <translation>警告：{0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6260"/>
+        <location filename="../QScintilla/Editor.py" line="6266"/>
         <source>Error: {0}</source>
         <translation>错误：{0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6591"/>
+        <location filename="../QScintilla/Editor.py" line="6597"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;警告：&lt;/b&gt;您在重新打开时将丢失所有更改。</translation>
     </message>
@@ -10441,27 +10453,27 @@
         <translation>上一个更改</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7789"/>
+        <location filename="../QScintilla/Editor.py" line="7795"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6189"/>
+        <location filename="../QScintilla/Editor.py" line="6195"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6250"/>
+        <location filename="../QScintilla/Editor.py" line="6256"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10486,7 +10498,7 @@
         <translation>使用指定编码重新打开</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6585"/>
+        <location filename="../QScintilla/Editor.py" line="6591"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10511,22 +10523,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4868"/>
+        <location filename="../QScintilla/Editor.py" line="4874"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7876"/>
+        <location filename="../QScintilla/Editor.py" line="7882"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>

Mercurial Repository: eric

eric ide

mercurial