Added the capability to send these emails via Google Mail using OAuth2 authentication.

Mon, 26 Jun 2017 19:31:49 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 26 Jun 2017 19:31:49 +0200
changeset 5769
944c04cec861
parent 5768
6f4d7d02cb1e
child 5770
5b5f2bc99aab

Added the capability to send these emails via Google Mail using OAuth2 authentication.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
APIs/Python3/eric6.bas file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Gui.E5SimpleHelpDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Network.E5GoogleMail.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Templates.TemplateHelpDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.UI.EmailDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.E5Gui.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.E5Network.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.Templates.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.UI.html file | annotate | diff | comparison | revisions
E5Gui/E5SimpleHelpDialog.py file | annotate | diff | comparison | revisions
E5Gui/E5SimpleHelpDialog.ui file | annotate | diff | comparison | revisions
E5Network/E5GoogleMail.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EmailPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EmailPage.ui file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
Templates/TemplateHelpDialog.py file | annotate | diff | comparison | revisions
Templates/TemplateHelpDialog.ui file | annotate | diff | comparison | revisions
Templates/TemplatePropertiesDialog.py file | annotate | diff | comparison | revisions
UI/EmailDialog.py file | annotate | diff | comparison | revisions
changelog file | annotate | diff | comparison | revisions
eric6.e4p file | annotate | diff | comparison | revisions
i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
i18n/eric6_de.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/APIs/Python3/eric6.api	Sun Jun 25 16:17:00 2017 +0200
+++ b/APIs/Python3/eric6.api	Mon Jun 26 19:31:49 2017 +0200
@@ -1243,6 +1243,7 @@
 eric6.E5Gui.E5SideBar.E5SideBar.tabWhatsThis?4(index)
 eric6.E5Gui.E5SideBar.E5SideBar.widget?4(index)
 eric6.E5Gui.E5SideBar.E5SideBar?1(orientation=None, delay=200, parent=None)
+eric6.E5Gui.E5SimpleHelpDialog.E5SimpleHelpDialog?1(title="", label="", help="", parent=None)
 eric6.E5Gui.E5SingleApplication.E5SingleApplicationClient.processArgs?4(args)
 eric6.E5Gui.E5SingleApplication.E5SingleApplicationClient?1()
 eric6.E5Gui.E5SingleApplication.E5SingleApplicationServer.handleCommand?4(cmd, params)
@@ -1433,6 +1434,14 @@
 eric6.E5Network.E5Ftp.E5FtpProxyType.Site?7
 eric6.E5Network.E5Ftp.E5FtpProxyType.UserAtProxyuserAtServer?7
 eric6.E5Network.E5Ftp.E5FtpProxyType.UserAtServer?7
+eric6.E5Network.E5GoogleMail.APPLICATION_NAME?7
+eric6.E5Network.E5GoogleMail.CLIENT_SECRET_FILE?7
+eric6.E5Network.E5GoogleMail.GoogleMailHelp?4()
+eric6.E5Network.E5GoogleMail.GoogleMailSendMessage?4(message)
+eric6.E5Network.E5GoogleMail.SCOPES?7
+eric6.E5Network.E5GoogleMail._prepareMessage_v2?5(message)
+eric6.E5Network.E5GoogleMail._prepareMessage_v3?5(message)
+eric6.E5Network.E5GoogleMail.getCredentials?4()
 eric6.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog.setData?4(name, value)
 eric6.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog?1(parent=None)
 eric6.E5Network.E5NetworkIcon.E5NetworkIcon.isOnline?4()
@@ -8388,7 +8397,6 @@
 eric6.Tasks.TaskViewer.TaskViewer.setProjectOpen?4(o=False)
 eric6.Tasks.TaskViewer.TaskViewer.stopProjectTaskExtraction?4()
 eric6.Tasks.TaskViewer.TaskViewer?1(parent, project)
-eric6.Templates.TemplateHelpDialog.TemplateHelpDialog?1(parent=None)
 eric6.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog.getVariables?4()
 eric6.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog?1(variables, parent=None)
 eric6.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog.getData?4()
@@ -8705,6 +8713,7 @@
 eric6.UI.EmailDialog.EmailDialog.on_buttonBox_clicked?4(button)
 eric6.UI.EmailDialog.EmailDialog.on_buttonBox_rejected?4()
 eric6.UI.EmailDialog.EmailDialog.on_deleteButton_clicked?4()
+eric6.UI.EmailDialog.EmailDialog.on_googleHelpButton_clicked?4()
 eric6.UI.EmailDialog.EmailDialog.on_message_textChanged?4()
 eric6.UI.EmailDialog.EmailDialog.on_sendButton_clicked?4()
 eric6.UI.EmailDialog.EmailDialog.on_subject_textChanged?4(txt)
--- a/APIs/Python3/eric6.bas	Sun Jun 25 16:17:00 2017 +0200
+++ b/APIs/Python3/eric6.bas	Mon Jun 26 19:31:49 2017 +0200
@@ -189,6 +189,7 @@
 E5ProgressDialog QProgressDialog
 E5RequestModel QAbstractTableModel
 E5SideBar QWidget
+E5SimpleHelpDialog QDialog Ui_E5SimpleHelpDialog
 E5SingleApplicationClient SingleApplicationClient
 E5SingleApplicationServer SingleApplicationServer
 E5SqueezeLabel QLabel
@@ -801,7 +802,6 @@
 TasksWriter XMLStreamWriterBase
 TemplateEntry QTreeWidgetItem
 TemplateGroup QTreeWidgetItem
-TemplateHelpDialog QDialog Ui_TemplateHelpDialog
 TemplateMultipleVariablesDialog QDialog
 TemplatePropertiesDialog QDialog Ui_TemplatePropertiesDialog
 TemplateSingleVariableDialog QDialog Ui_TemplateSingleVariableDialog
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sun Jun 25 16:17:00 2017 +0200
+++ b/Documentation/Help/source.qhp	Mon Jun 26 19:31:49 2017 +0200
@@ -107,6 +107,7 @@
             <section title="eric6.E5Gui.E5PathPicker" ref="eric6.E5Gui.E5PathPicker.html" />
             <section title="eric6.E5Gui.E5ProgressDialog" ref="eric6.E5Gui.E5ProgressDialog.html" />
             <section title="eric6.E5Gui.E5SideBar" ref="eric6.E5Gui.E5SideBar.html" />
+            <section title="eric6.E5Gui.E5SimpleHelpDialog" ref="eric6.E5Gui.E5SimpleHelpDialog.html" />
             <section title="eric6.E5Gui.E5SingleApplication" ref="eric6.E5Gui.E5SingleApplication.html" />
             <section title="eric6.E5Gui.E5SqueezeLabels" ref="eric6.E5Gui.E5SqueezeLabels.html" />
             <section title="eric6.E5Gui.E5StringListEditWidget" ref="eric6.E5Gui.E5StringListEditWidget.html" />
@@ -127,6 +128,7 @@
             <section title="eric6.E5Network.data" ref="index-eric6.E5Network.data.html">
             </section>
             <section title="eric6.E5Network.E5Ftp" ref="eric6.E5Network.E5Ftp.html" />
+            <section title="eric6.E5Network.E5GoogleMail" ref="eric6.E5Network.E5GoogleMail.html" />
             <section title="eric6.E5Network.E5NetworkHeaderDetailsDialog" ref="eric6.E5Network.E5NetworkHeaderDetailsDialog.html" />
             <section title="eric6.E5Network.E5NetworkIcon" ref="eric6.E5Network.E5NetworkIcon.html" />
             <section title="eric6.E5Network.E5NetworkMonitor" ref="eric6.E5Network.E5NetworkMonitor.html" />
@@ -982,7 +984,6 @@
             <section title="eric6.Tasks.TaskViewer" ref="eric6.Tasks.TaskViewer.html" />
           </section>
           <section title="eric6.Templates" ref="index-eric6.Templates.html">
-            <section title="eric6.Templates.TemplateHelpDialog" ref="eric6.Templates.TemplateHelpDialog.html" />
             <section title="eric6.Templates.TemplateMultipleVariablesDialog" ref="eric6.Templates.TemplateMultipleVariablesDialog.html" />
             <section title="eric6.Templates.TemplatePropertiesDialog" ref="eric6.Templates.TemplatePropertiesDialog.html" />
             <section title="eric6.Templates.TemplateSingleVariableDialog" ref="eric6.Templates.TemplateSingleVariableDialog.html" />
@@ -4203,6 +4204,7 @@
       <keyword name="E5GenericDiffHighlighter.highlightBlock" id="E5GenericDiffHighlighter.highlightBlock" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.highlightBlock" />
       <keyword name="E5GenericDiffHighlighter.makeFormat" id="E5GenericDiffHighlighter.makeFormat" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.makeFormat" />
       <keyword name="E5GenericDiffHighlighter.regenerateRules" id="E5GenericDiffHighlighter.regenerateRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.regenerateRules" />
+      <keyword name="E5GoogleMail (Module)" id="E5GoogleMail (Module)" ref="eric6.E5Network.E5GoogleMail.html" />
       <keyword name="E5Graphics (Package)" id="E5Graphics (Package)" ref="index-eric6.E5Graphics.html" />
       <keyword name="E5GraphicsView" id="E5GraphicsView" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView" />
       <keyword name="E5GraphicsView (Constructor)" id="E5GraphicsView (Constructor)" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.__init__" />
@@ -4557,6 +4559,9 @@
       <keyword name="E5SideBar.tabToolTip" id="E5SideBar.tabToolTip" ref="eric6.E5Gui.E5SideBar.html#E5SideBar.tabToolTip" />
       <keyword name="E5SideBar.tabWhatsThis" id="E5SideBar.tabWhatsThis" ref="eric6.E5Gui.E5SideBar.html#E5SideBar.tabWhatsThis" />
       <keyword name="E5SideBar.widget" id="E5SideBar.widget" ref="eric6.E5Gui.E5SideBar.html#E5SideBar.widget" />
+      <keyword name="E5SimpleHelpDialog" id="E5SimpleHelpDialog" ref="eric6.E5Gui.E5SimpleHelpDialog.html#E5SimpleHelpDialog" />
+      <keyword name="E5SimpleHelpDialog (Constructor)" id="E5SimpleHelpDialog (Constructor)" ref="eric6.E5Gui.E5SimpleHelpDialog.html#E5SimpleHelpDialog.__init__" />
+      <keyword name="E5SimpleHelpDialog (Module)" id="E5SimpleHelpDialog (Module)" ref="eric6.E5Gui.E5SimpleHelpDialog.html" />
       <keyword name="E5SingleApplication (Module)" id="E5SingleApplication (Module)" ref="eric6.E5Gui.E5SingleApplication.html" />
       <keyword name="E5SingleApplicationClient" id="E5SingleApplicationClient" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient" />
       <keyword name="E5SingleApplicationClient (Constructor)" id="E5SingleApplicationClient (Constructor)" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient.__init__" />
@@ -5424,12 +5429,14 @@
       <keyword name="EmailDialog.__encodedHeader" id="EmailDialog.__encodedHeader" ref="eric6.UI.EmailDialog.html#EmailDialog.__encodedHeader" />
       <keyword name="EmailDialog.__encodedText" id="EmailDialog.__encodedText" ref="eric6.UI.EmailDialog.html#EmailDialog.__encodedText" />
       <keyword name="EmailDialog.__sendmail" id="EmailDialog.__sendmail" ref="eric6.UI.EmailDialog.html#EmailDialog.__sendmail" />
+      <keyword name="EmailDialog.__sendmailGoogle" id="EmailDialog.__sendmailGoogle" ref="eric6.UI.EmailDialog.html#EmailDialog.__sendmailGoogle" />
       <keyword name="EmailDialog.attachFile" id="EmailDialog.attachFile" ref="eric6.UI.EmailDialog.html#EmailDialog.attachFile" />
       <keyword name="EmailDialog.keyPressEvent" id="EmailDialog.keyPressEvent" ref="eric6.UI.EmailDialog.html#EmailDialog.keyPressEvent" />
       <keyword name="EmailDialog.on_addButton_clicked" id="EmailDialog.on_addButton_clicked" ref="eric6.UI.EmailDialog.html#EmailDialog.on_addButton_clicked" />
       <keyword name="EmailDialog.on_buttonBox_clicked" id="EmailDialog.on_buttonBox_clicked" ref="eric6.UI.EmailDialog.html#EmailDialog.on_buttonBox_clicked" />
       <keyword name="EmailDialog.on_buttonBox_rejected" id="EmailDialog.on_buttonBox_rejected" ref="eric6.UI.EmailDialog.html#EmailDialog.on_buttonBox_rejected" />
       <keyword name="EmailDialog.on_deleteButton_clicked" id="EmailDialog.on_deleteButton_clicked" ref="eric6.UI.EmailDialog.html#EmailDialog.on_deleteButton_clicked" />
+      <keyword name="EmailDialog.on_googleHelpButton_clicked" id="EmailDialog.on_googleHelpButton_clicked" ref="eric6.UI.EmailDialog.html#EmailDialog.on_googleHelpButton_clicked" />
       <keyword name="EmailDialog.on_message_textChanged" id="EmailDialog.on_message_textChanged" ref="eric6.UI.EmailDialog.html#EmailDialog.on_message_textChanged" />
       <keyword name="EmailDialog.on_sendButton_clicked" id="EmailDialog.on_sendButton_clicked" ref="eric6.UI.EmailDialog.html#EmailDialog.on_sendButton_clicked" />
       <keyword name="EmailDialog.on_subject_textChanged" id="EmailDialog.on_subject_textChanged" ref="eric6.UI.EmailDialog.html#EmailDialog.on_subject_textChanged" />
@@ -6169,6 +6176,8 @@
       <keyword name="Function.addDescription" id="Function.addDescription" ref="eric6.Utilities.ModuleParser.html#Function.addDescription" />
       <keyword name="Function.setEndLine" id="Function.setEndLine" ref="eric6.Utilities.ModuleParser.html#Function.setEndLine" />
       <keyword name="Globals (Package)" id="Globals (Package)" ref="index-eric6.Globals.html" />
+      <keyword name="GoogleMailHelp" id="GoogleMailHelp" ref="eric6.E5Network.E5GoogleMail.html#GoogleMailHelp" />
+      <keyword name="GoogleMailSendMessage" id="GoogleMailSendMessage" ref="eric6.E5Network.E5GoogleMail.html#GoogleMailSendMessage" />
       <keyword name="GotoDialog" id="GotoDialog" ref="eric6.QScintilla.GotoDialog.html#GotoDialog" />
       <keyword name="GotoDialog (Constructor)" id="GotoDialog (Constructor)" ref="eric6.QScintilla.GotoDialog.html#GotoDialog.__init__" />
       <keyword name="GotoDialog (Module)" id="GotoDialog (Module)" ref="eric6.QScintilla.GotoDialog.html" />
@@ -14377,9 +14386,6 @@
       <keyword name="TemplateGroup.removeEntry" id="TemplateGroup.removeEntry" ref="eric6.Templates.TemplateViewer.html#TemplateGroup.removeEntry" />
       <keyword name="TemplateGroup.setLanguage" id="TemplateGroup.setLanguage" ref="eric6.Templates.TemplateViewer.html#TemplateGroup.setLanguage" />
       <keyword name="TemplateGroup.setName" id="TemplateGroup.setName" ref="eric6.Templates.TemplateViewer.html#TemplateGroup.setName" />
-      <keyword name="TemplateHelpDialog" id="TemplateHelpDialog" ref="eric6.Templates.TemplateHelpDialog.html#TemplateHelpDialog" />
-      <keyword name="TemplateHelpDialog (Constructor)" id="TemplateHelpDialog (Constructor)" ref="eric6.Templates.TemplateHelpDialog.html#TemplateHelpDialog.__init__" />
-      <keyword name="TemplateHelpDialog (Module)" id="TemplateHelpDialog (Module)" ref="eric6.Templates.TemplateHelpDialog.html" />
       <keyword name="TemplateMultipleVariablesDialog" id="TemplateMultipleVariablesDialog" ref="eric6.Templates.TemplateMultipleVariablesDialog.html#TemplateMultipleVariablesDialog" />
       <keyword name="TemplateMultipleVariablesDialog (Constructor)" id="TemplateMultipleVariablesDialog (Constructor)" ref="eric6.Templates.TemplateMultipleVariablesDialog.html#TemplateMultipleVariablesDialog.__init__" />
       <keyword name="TemplateMultipleVariablesDialog (Module)" id="TemplateMultipleVariablesDialog (Module)" ref="eric6.Templates.TemplateMultipleVariablesDialog.html" />
@@ -16478,6 +16484,8 @@
       <keyword name="_main" id="_main" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_main" />
       <keyword name="_parse_multi_options" id="_parse_multi_options" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_parse_multi_options" />
       <keyword name="_percentReplacementFunc" id="_percentReplacementFunc" ref="eric6.Utilities.__init__.html#_percentReplacementFunc" />
+      <keyword name="_prepareMessage_v2" id="_prepareMessage_v2" ref="eric6.E5Network.E5GoogleMail.html#_prepareMessage_v2" />
+      <keyword name="_prepareMessage_v3" id="_prepareMessage_v3" ref="eric6.E5Network.E5GoogleMail.html#_prepareMessage_v3" />
       <keyword name="absolutePath" id="absolutePath" ref="eric6.Utilities.__init__.html#absolutePath" />
       <keyword name="absoluteUniversalPath" id="absoluteUniversalPath" ref="eric6.Utilities.__init__.html#absoluteUniversalPath" />
       <keyword name="addActions" id="addActions" ref="eric6.E5Gui.E5Action.html#addActions" />
@@ -16741,6 +16749,7 @@
       <keyword name="getConfigPath" id="getConfigPath" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html#getConfigPath" />
       <keyword name="getCooperation" id="getCooperation" ref="eric6.Preferences.__init__.html#getCooperation" />
       <keyword name="getCorba" id="getCorba" ref="eric6.Preferences.__init__.html#getCorba" />
+      <keyword name="getCredentials" id="getCredentials" ref="eric6.E5Network.E5GoogleMail.html#getCredentials" />
       <keyword name="getDebugger" id="getDebugger" ref="eric6.Preferences.__init__.html#getDebugger" />
       <keyword name="getDefaultLexerAssociations" id="getDefaultLexerAssociations" ref="eric6.QScintilla.Lexers.__init__.html#getDefaultLexerAssociations" />
       <keyword name="getDefaults" id="getDefaults" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__.html#getDefaults" />
@@ -17320,6 +17329,7 @@
       <file>eric6.E5Gui.E5PathPicker.html</file>
       <file>eric6.E5Gui.E5ProgressDialog.html</file>
       <file>eric6.E5Gui.E5SideBar.html</file>
+      <file>eric6.E5Gui.E5SimpleHelpDialog.html</file>
       <file>eric6.E5Gui.E5SingleApplication.html</file>
       <file>eric6.E5Gui.E5SqueezeLabels.html</file>
       <file>eric6.E5Gui.E5StringListEditWidget.html</file>
@@ -17336,6 +17346,7 @@
       <file>eric6.E5Gui.E5TreeWidget.html</file>
       <file>eric6.E5Gui.E5ZoomWidget.html</file>
       <file>eric6.E5Network.E5Ftp.html</file>
+      <file>eric6.E5Network.E5GoogleMail.html</file>
       <file>eric6.E5Network.E5NetworkHeaderDetailsDialog.html</file>
       <file>eric6.E5Network.E5NetworkIcon.html</file>
       <file>eric6.E5Network.E5NetworkMonitor.html</file>
@@ -18013,7 +18024,6 @@
       <file>eric6.Tasks.TaskFilterConfigDialog.html</file>
       <file>eric6.Tasks.TaskPropertiesDialog.html</file>
       <file>eric6.Tasks.TaskViewer.html</file>
-      <file>eric6.Templates.TemplateHelpDialog.html</file>
       <file>eric6.Templates.TemplateMultipleVariablesDialog.html</file>
       <file>eric6.Templates.TemplatePropertiesDialog.html</file>
       <file>eric6.Templates.TemplateSingleVariableDialog.html</file>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.E5Gui.E5SimpleHelpDialog.html	Mon Jun 26 19:31:49 2017 +0200
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.E5Gui.E5SimpleHelpDialog</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.E5Gui.E5SimpleHelpDialog</h1>
+<p>
+Module implementing a dialog to show some help text.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#E5SimpleHelpDialog">E5SimpleHelpDialog</a></td>
+<td>Class implementing a dialog to show some help text.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="E5SimpleHelpDialog" ID="E5SimpleHelpDialog"></a>
+<h2>E5SimpleHelpDialog</h2>
+<p>
+    Class implementing a dialog to show some help text.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_E5SimpleHelpDialog
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#E5SimpleHelpDialog.__init__">E5SimpleHelpDialog</a></td>
+<td>Constructor</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="E5SimpleHelpDialog.__init__" ID="E5SimpleHelpDialog.__init__"></a>
+<h4>E5SimpleHelpDialog (Constructor)</h4>
+<b>E5SimpleHelpDialog</b>(<i>title="", label="", help="", parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>title</i> (str)</dt>
+<dd>
+title of the window
+</dd><dt><i>label</i> (str)</dt>
+<dd>
+label for the help
+</dd><dt><i>help</i> (str)</dt>
+<dd>
+HTML help text
+</dd><dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.E5Network.E5GoogleMail.html	Mon Jun 26 19:31:49 2017 +0200
@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.E5Network.E5GoogleMail</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.E5Network.E5GoogleMail</h1>
+<p>
+Module implementing a dialog to send bug reports.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>APPLICATION_NAME</td></tr><tr><td>CLIENT_SECRET_FILE</td></tr><tr><td>SCOPES</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#GoogleMailHelp">GoogleMailHelp</a></td>
+<td>Module function to get some help about how to enable the Google Mail OAuth2 service.</td>
+</tr><tr>
+<td><a href="#GoogleMailSendMessage">GoogleMailSendMessage</a></td>
+<td>Module function to send an email message via Google Mail.</td>
+</tr><tr>
+<td><a href="#_prepareMessage_v2">_prepareMessage_v2</a></td>
+<td>Module function to prepare the message for sending (Python2 Variant).</td>
+</tr><tr>
+<td><a href="#_prepareMessage_v3">_prepareMessage_v3</a></td>
+<td>Module function to prepare the message for sending (Python2 Variant).</td>
+</tr><tr>
+<td><a href="#getCredentials">getCredentials</a></td>
+<td>Module function to get the Google credentials.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="GoogleMailHelp" ID="GoogleMailHelp"></a>
+<h2>GoogleMailHelp</h2>
+<b>GoogleMailHelp</b>(<i></i>)
+<p>
+    Module function to get some help about how to enable the Google Mail
+    OAuth2 service.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+help text
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="GoogleMailSendMessage" ID="GoogleMailSendMessage"></a>
+<h2>GoogleMailSendMessage</h2>
+<b>GoogleMailSendMessage</b>(<i>message</i>)
+<p>
+    Module function to send an email message via Google Mail.
+</p><dl>
+<dt><i>message</i> (email.mime.text.MIMEBase)</dt>
+<dd>
+email message to be sent
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+tuple containing a success flag and a result or error message
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (bool, str)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="_prepareMessage_v2" ID="_prepareMessage_v2"></a>
+<h2>_prepareMessage_v2</h2>
+<b>_prepareMessage_v2</b>(<i>message</i>)
+<p>
+    Module function to prepare the message for sending (Python2 Variant).
+</p><dl>
+<dt><i>message</i> (email.mime.text.MIMEBase)</dt>
+<dd>
+message to be prepared
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+prepared message dictionary
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+dict
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="_prepareMessage_v3" ID="_prepareMessage_v3"></a>
+<h2>_prepareMessage_v3</h2>
+<b>_prepareMessage_v3</b>(<i>message</i>)
+<p>
+    Module function to prepare the message for sending (Python2 Variant).
+</p><dl>
+<dt><i>message</i> (email.mime.text.MIMEBase)</dt>
+<dd>
+message to be prepared
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+prepared message dictionary
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+dict
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="getCredentials" ID="getCredentials"></a>
+<h2>getCredentials</h2>
+<b>getCredentials</b>(<i></i>)
+<p>
+    Module function to get the Google credentials.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+Google Mail credentials
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.Templates.TemplateHelpDialog.html	Sun Jun 25 16:17:00 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<title>eric6.Templates.TemplateHelpDialog</title>
-<meta charset="UTF-8">
-<style>
-body {
-    background: #EDECE6;
-    margin: 0em 1em 10em 1em;
-    color: black;
-}
-
-h1 { color: white; background: #85774A; }
-h2 { color: white; background: #85774A; }
-h3 { color: white; background: #9D936E; }
-h4 { color: white; background: #9D936E; }
-    
-a { color: #BA6D36; }
-
-</style>
-</head>
-<body><a NAME="top" ID="top"></a>
-<h1>eric6.Templates.TemplateHelpDialog</h1>
-<p>
-Module implementing a dialog to show some template help.
-</p>
-<h3>Global Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Classes</h3>
-<table>
-<tr>
-<td><a href="#TemplateHelpDialog">TemplateHelpDialog</a></td>
-<td>Class implementing a dialog to show some template help.</td>
-</tr>
-</table>
-<h3>Functions</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<hr /><hr />
-<a NAME="TemplateHelpDialog" ID="TemplateHelpDialog"></a>
-<h2>TemplateHelpDialog</h2>
-<p>
-    Class implementing a dialog to show some template help.
-</p>
-<h3>Derived from</h3>
-QDialog, Ui_TemplateHelpDialog
-<h3>Class Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#TemplateHelpDialog.__init__">TemplateHelpDialog</a></td>
-<td>Constructor</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="TemplateHelpDialog.__init__" ID="TemplateHelpDialog.__init__"></a>
-<h4>TemplateHelpDialog (Constructor)</h4>
-<b>TemplateHelpDialog</b>(<i>parent=None</i>)
-<p>
-        Constructor
-</p><dl>
-<dt><i>parent</i> (QWidget)</dt>
-<dd>
-reference to the parent widget
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
-</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.UI.EmailDialog.html	Sun Jun 25 16:17:00 2017 +0200
+++ b/Documentation/Source/eric6.UI.EmailDialog.html	Mon Jun 26 19:31:49 2017 +0200
@@ -21,7 +21,7 @@
 <body><a NAME="top" ID="top"></a>
 <h1>eric6.UI.EmailDialog</h1>
 <p>
-Module implementing a dialog to send bug reports.
+Module implementing a dialog to send bug reports or feature requests.
 </p>
 <h3>Global Attributes</h3>
 <table>
@@ -31,7 +31,7 @@
 <table>
 <tr>
 <td><a href="#EmailDialog">EmailDialog</a></td>
-<td>Class implementing a dialog to send bug reports.</td>
+<td>Class implementing a dialog to send bug reports or feature requests.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -45,7 +45,7 @@
 <a NAME="EmailDialog" ID="EmailDialog"></a>
 <h2>EmailDialog</h2>
 <p>
-    Class implementing a dialog to send bug reports.
+    Class implementing a dialog to send bug reports or feature requests.
 </p>
 <h3>Derived from</h3>
 QDialog, Ui_EmailDialog
@@ -78,6 +78,9 @@
 <td><a href="#EmailDialog.__sendmail">__sendmail</a></td>
 <td>Private method to actually send the message.</td>
 </tr><tr>
+<td><a href="#EmailDialog.__sendmailGoogle">__sendmailGoogle</a></td>
+<td>Private method to actually send the message via Google Mail.</td>
+</tr><tr>
 <td><a href="#EmailDialog.attachFile">attachFile</a></td>
 <td>Public method to add an attachment.</td>
 </tr><tr>
@@ -96,6 +99,9 @@
 <td><a href="#EmailDialog.on_deleteButton_clicked">on_deleteButton_clicked</a></td>
 <td>Private slot to handle the Delete button.</td>
 </tr><tr>
+<td><a href="#EmailDialog.on_googleHelpButton_clicked">on_googleHelpButton_clicked</a></td>
+<td>Private slot to show some help text "how to turn on the Gmail API".</td>
+</tr><tr>
 <td><a href="#EmailDialog.on_message_textChanged">on_message_textChanged</a></td>
 <td>Private slot to handle the textChanged signal of the message edit.</td>
 </tr><tr>
@@ -131,7 +137,12 @@
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-string containing the mail message
+prepared mail message
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+email.mime.text.MIMEMultipart
 </dd>
 </dl><a NAME="EmailDialog.__createSimpleMail" ID="EmailDialog.__createSimpleMail"></a>
 <h4>EmailDialog.__createSimpleMail</h4>
@@ -141,7 +152,12 @@
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-string containing the mail message
+prepared mail message
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+email.mime.text.MIMEText
 </dd>
 </dl><a NAME="EmailDialog.__encodedHeader" ID="EmailDialog.__encodedHeader"></a>
 <h4>EmailDialog.__encodedHeader</h4>
@@ -188,6 +204,26 @@
 <dd>
 flag indicating success (boolean)
 </dd>
+</dl><a NAME="EmailDialog.__sendmailGoogle" ID="EmailDialog.__sendmailGoogle"></a>
+<h4>EmailDialog.__sendmailGoogle</h4>
+<b>__sendmailGoogle</b>(<i>msg</i>)
+<p>
+        Private method to actually send the message via Google Mail.
+</p><dl>
+<dt><i>message</i> (email.mime.text.MIMEBase)</dt>
+<dd>
+email message to be sent
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="EmailDialog.attachFile" ID="EmailDialog.attachFile"></a>
 <h4>EmailDialog.attachFile</h4>
 <b>attachFile</b>(<i>fname, deleteFile</i>)
@@ -237,6 +273,11 @@
 <b>on_deleteButton_clicked</b>(<i></i>)
 <p>
         Private slot to handle the Delete button.
+</p><a NAME="EmailDialog.on_googleHelpButton_clicked" ID="EmailDialog.on_googleHelpButton_clicked"></a>
+<h4>EmailDialog.on_googleHelpButton_clicked</h4>
+<b>on_googleHelpButton_clicked</b>(<i></i>)
+<p>
+        Private slot to show some help text "how to turn on the Gmail API".
 </p><a NAME="EmailDialog.on_message_textChanged" ID="EmailDialog.on_message_textChanged"></a>
 <h4>EmailDialog.on_message_textChanged</h4>
 <b>on_message_textChanged</b>(<i></i>)
--- a/Documentation/Source/index-eric6.E5Gui.html	Sun Jun 25 16:17:00 2017 +0200
+++ b/Documentation/Source/index-eric6.E5Gui.html	Mon Jun 26 19:31:49 2017 +0200
@@ -105,6 +105,9 @@
 <td><a href="eric6.E5Gui.E5SideBar.html">E5SideBar</a></td>
 <td>Module implementing a sidebar class.</td>
 </tr><tr>
+<td><a href="eric6.E5Gui.E5SimpleHelpDialog.html">E5SimpleHelpDialog</a></td>
+<td>Module implementing a dialog to show some help text.</td>
+</tr><tr>
 <td><a href="eric6.E5Gui.E5SingleApplication.html">E5SingleApplication</a></td>
 <td>Module implementing the single application server and client.</td>
 </tr><tr>
--- a/Documentation/Source/index-eric6.E5Network.html	Sun Jun 25 16:17:00 2017 +0200
+++ b/Documentation/Source/index-eric6.E5Network.html	Mon Jun 26 19:31:49 2017 +0200
@@ -38,6 +38,9 @@
 <td><a href="eric6.E5Network.E5Ftp.html">E5Ftp</a></td>
 <td>Module implementing an extension to the Python FTP class to support FTP proxies.</td>
 </tr><tr>
+<td><a href="eric6.E5Network.E5GoogleMail.html">E5GoogleMail</a></td>
+<td>Module implementing a dialog to send bug reports.</td>
+</tr><tr>
 <td><a href="eric6.E5Network.E5NetworkHeaderDetailsDialog.html">E5NetworkHeaderDetailsDialog</a></td>
 <td>Module implementing a dialog to show the data of a response or reply header.</td>
 </tr><tr>
--- a/Documentation/Source/index-eric6.Templates.html	Sun Jun 25 16:17:00 2017 +0200
+++ b/Documentation/Source/index-eric6.Templates.html	Mon Jun 26 19:31:49 2017 +0200
@@ -28,9 +28,6 @@
 <h3>Modules</h3>
 <table>
 <tr>
-<td><a href="eric6.Templates.TemplateHelpDialog.html">TemplateHelpDialog</a></td>
-<td>Module implementing a dialog to show some template help.</td>
-</tr><tr>
 <td><a href="eric6.Templates.TemplateMultipleVariablesDialog.html">TemplateMultipleVariablesDialog</a></td>
 <td>Module implementing a dialog for entering multiple template variables.</td>
 </tr><tr>
--- a/Documentation/Source/index-eric6.UI.html	Sun Jun 25 16:17:00 2017 +0200
+++ b/Documentation/Source/index-eric6.UI.html	Mon Jun 26 19:31:49 2017 +0200
@@ -69,7 +69,7 @@
 <td>Module implementing a syntax highlighter for unified and context diff outputs.</td>
 </tr><tr>
 <td><a href="eric6.UI.EmailDialog.html">EmailDialog</a></td>
-<td>Module implementing a dialog to send bug reports.</td>
+<td>Module implementing a dialog to send bug reports or feature requests.</td>
 </tr><tr>
 <td><a href="eric6.UI.ErrorLogDialog.html">ErrorLogDialog</a></td>
 <td>Module implementing a dialog to display an error log.</td>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/E5Gui/E5SimpleHelpDialog.py	Mon Jun 26 19:31:49 2017 +0200
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a dialog to show some help text.
+"""
+
+from __future__ import unicode_literals
+
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QDialog
+
+from .Ui_E5SimpleHelpDialog import Ui_E5SimpleHelpDialog
+
+
+class E5SimpleHelpDialog(QDialog, Ui_E5SimpleHelpDialog):
+    """
+    Class implementing a dialog to show some help text.
+    """
+    def __init__(self, title="", label="", help="", parent=None):
+        """
+        Constructor
+        
+        @param title title of the window
+        @type str
+        @param label label for the help
+        @type str
+        @param help HTML help text
+        @type str
+        @param parent reference to the parent widget
+        @type QWidget
+        """
+        super(E5SimpleHelpDialog, self).__init__(parent)
+        self.setupUi(self)
+        self.setWindowFlags(Qt.Window)
+        
+        self.setWindowTitle(title)
+        if label:
+            self.helpLabel.setText(label)
+        else:
+            self.helpLabel.hide()
+        self.helpEdit.setHtml(help)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/E5Gui/E5SimpleHelpDialog.ui	Mon Jun 26 19:31:49 2017 +0200
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>E5SimpleHelpDialog</class>
+ <widget class="QDialog" name="E5SimpleHelpDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="helpLabel"/>
+   </item>
+   <item>
+    <widget class="QTextBrowser" name="helpEdit">
+     <property name="tabChangesFocus">
+      <bool>true</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>E5SimpleHelpDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>E5SimpleHelpDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/E5Network/E5GoogleMail.py	Mon Jun 26 19:31:49 2017 +0200
@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a dialog to send bug reports.
+"""
+
+from __future__ import unicode_literals
+try:
+    str = unicode       # __IGNORE_EXCEPTION__
+except NameError:
+    pass
+
+import os
+import sys
+import base64
+
+import httplib2
+
+import oauth2client.file
+from oauth2client import client, tools
+
+from googleapiclient import discovery
+
+import Globals
+
+
+SCOPES = 'https://www.googleapis.com/auth/gmail.send'
+CLIENT_SECRET_FILE = 'eric_client_secret.json'
+APPLICATION_NAME = 'Eric Python Send Email'
+
+
+def getCredentials():
+    """
+    Module function to get the Google credentials.
+    
+    @return Google Mail credentials
+    """
+    homeDir = os.path.expanduser('~')
+    credentialDir = os.path.join(homeDir, '.credentials')
+    if not os.path.exists(credentialDir):
+        os.makedirs(credentialDir)
+    credentialPath = os.path.join(credentialDir,
+                                  'eric-python-email-send.json')
+    store = oauth2client.file.Storage(credentialPath)
+    credentials = store.get()
+    if not credentials or credentials.invalid:
+        flow = client.flow_from_clientsecrets(
+            os.path.join(Globals.getConfigDir(), CLIENT_SECRET_FILE),
+            SCOPES)
+        flow.user_agent = APPLICATION_NAME
+        credentials = tools.run_flow(flow, store)
+    return credentials
+
+
+def GoogleMailSendMessage(message):
+    """
+    Module function to send an email message via Google Mail.
+    
+    @param message email message to be sent
+    @type email.mime.text.MIMEBase
+    @return tuple containing a success flag and a result or error message
+    @rtype tuple of (bool, str)
+    """
+    try:
+        credentials = getCredentials()
+        http = credentials.authorize(httplib2.Http())
+        service = discovery.build('gmail', 'v1', http=http)
+        if sys.version_info[0] == 2:
+            message1 = _prepareMessage_v2(message)
+        else:
+            message1 = _prepareMessage_v3(message)
+        result = service.users().messages()\
+            .send(userId="me", body=message1).execute()
+
+        return True, result
+    except Exception as error:
+        return False, str(error)
+
+
+def _prepareMessage_v2(message):
+    """
+    Module function to prepare the message for sending (Python2 Variant).
+    
+    @param message message to be prepared
+    @type email.mime.text.MIMEBase
+    @return prepared message dictionary
+    @rtype dict
+    """
+    raw = base64.urlsafe_b64encode(message.as_string())
+    return {'raw': raw}
+
+
+def _prepareMessage_v3(message):
+    """
+    Module function to prepare the message for sending (Python2 Variant).
+    
+    @param message message to be prepared
+    @type email.mime.text.MIMEBase
+    @return prepared message dictionary
+    @rtype dict
+    """
+    messageAsBase64 = base64.urlsafe_b64encode(message.as_bytes())
+    raw = messageAsBase64.decode()
+    return {'raw': raw}
+
+
+def GoogleMailHelp():
+    """
+    Module function to get some help about how to enable the Google Mail
+    OAuth2 service.
+    
+    @return help text
+    @rtype str
+    """
+    return (
+        "<h2>Steps to turn on the Gmail API</h2>"
+        "<ol>"
+        "<li>Use <a href='{0}'>this wizard</a> to create or select a project"
+        " in the Google Developers Console and automatically turn on the API."
+        " Click <b>Continue</b>, then <b>Go to credentials</b>.</li>"
+        "<li>At the top of the page, select the <b>OAuth consent screen</b>"
+        " tab. Select an <b>Email address</b>, enter a <b>Product name</b> if"
+        " not already set, and click the <b>Save</b> button.</li>"
+        "<li>Select the <b>Credentials</b> tab, click the <b>Add credentials"
+        "</b> button and select <b>OAuth 2.0 client ID</b>.</li>"
+        "<li>Select the application type <b>Other</b>, enter the name &quot;"
+        "{1}&quot;, and click the <b>Create</b>"
+        " button.</li>"
+        "<li>Click <b>OK</b> to dismiss the resulting dialog.</li>"
+        "<li>Click the (Download JSON) button to the right of the client ID."
+        "</li>"
+        "<li>Move this file to the eric configuration directory"
+        " <code>{2}</code> and rename it <code>{3}</code>.</li>"
+        "</ol>".format(
+            "https://console.developers.google.com/start/api?id=gmail",
+            APPLICATION_NAME,
+            Globals.getConfigDir(),
+            CLIENT_SECRET_FILE
+        )
+    )
--- a/Preferences/ConfigurationPages/EmailPage.py	Sun Jun 25 16:17:00 2017 +0200
+++ b/Preferences/ConfigurationPages/EmailPage.py	Mon Jun 26 19:31:49 2017 +0200
@@ -37,6 +37,20 @@
         self.setObjectName("EmailPage")
         
         # set initial values
+        try:
+            import googleapiclient      # __IGNORE_WARNING__
+            self.googleMailCheckBox.setChecked(
+                Preferences.getUser("UseGoogleMailOAuth2"))
+        except ImportError:
+            # missing libraries, disable Google Mail
+            self.googleMailCheckBox.setChecked(False)
+            self.googleMailCheckBox.setEnabled(False)
+            self.googleMailInfoLabel.setText(self.tr(
+                "<p>The Google Mail Client API is not installed."
+                " Use <code>pip install --upgrade google-api-python-client"
+                "</code> to install it.</p>"))
+            Preferences.setUser("UseGoogleMailOAuth2", False)
+        
         self.mailServerEdit.setText(Preferences.getUser("MailServer"))
         self.portSpin.setValue(Preferences.getUser("MailServerPort"))
         self.emailEdit.setText(Preferences.getUser("Email"))
@@ -59,6 +73,9 @@
         Public slot to save the Email configuration.
         """
         Preferences.setUser(
+            "UseGoogleMailOAuth2",
+            self.googleMailCheckBox.isChecked())
+        Preferences.setUser(
             "MailServer",
             self.mailServerEdit.text())
         Preferences.setUser(
--- a/Preferences/ConfigurationPages/EmailPage.ui	Sun Jun 25 16:17:00 2017 +0200
+++ b/Preferences/ConfigurationPages/EmailPage.ui	Mon Jun 26 19:31:49 2017 +0200
@@ -6,11 +6,11 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>422</width>
-    <height>543</height>
+    <width>451</width>
+    <height>593</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -32,211 +32,246 @@
     </widget>
    </item>
    <item>
-    <layout class="QGridLayout" name="gridLayout_2">
-     <item row="0" column="0">
-      <widget class="QLabel" name="textLabel2_2">
-       <property name="text">
-        <string>Outgoing mail server (SMTP):</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" colspan="2">
-      <widget class="QLineEdit" name="mailServerEdit">
-       <property name="toolTip">
-        <string>Enter the address of your mail server</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Encryption Method:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" colspan="2">
-      <widget class="QFrame" name="frame">
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <property name="leftMargin">
-         <number>0</number>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Google Mail</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="googleMailCheckBox">
+        <property name="text">
+         <string>Use Google Mail with OAuth2 authentication</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="googleMailInfoLabel">
+        <property name="text">
+         <string>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
         </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QRadioButton" name="noEncryptionButton">
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Standard Email</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="QLabel" name="textLabel2_2">
+          <property name="text">
+           <string>Outgoing mail server (SMTP):</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" colspan="2">
+         <widget class="QLineEdit" name="mailServerEdit">
           <property name="toolTip">
-           <string>Select to use no encryption</string>
+           <string>Enter the address of your mail server</string>
           </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>None</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
+           <string>Encryption Method:</string>
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QRadioButton" name="useSslButton">
-          <property name="toolTip">
-           <string>Select to use SSL</string>
+        <item row="1" column="1" colspan="2">
+         <widget class="QFrame" name="frame">
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
           </property>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QRadioButton" name="noEncryptionButton">
+             <property name="toolTip">
+              <string>Select to use no encryption</string>
+             </property>
+             <property name="text">
+              <string>None</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="useSslButton">
+             <property name="toolTip">
+              <string>Select to use SSL</string>
+             </property>
+             <property name="text">
+              <string>SSL</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="useTlsButton">
+             <property name="toolTip">
+              <string>Select to use TLS</string>
+             </property>
+             <property name="text">
+              <string>TLS</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label">
           <property name="text">
-           <string>SSL</string>
+           <string>Port:</string>
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QRadioButton" name="useTlsButton">
+        <item row="2" column="1">
+         <widget class="QSpinBox" name="portSpin">
           <property name="toolTip">
-           <string>Select to use TLS</string>
+           <string>Enter the port of the mail server</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>65535</number>
+          </property>
+          <property name="value">
+           <number>25</number>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>138</width>
+            <height>20</height>
+           </size>
           </property>
+         </spacer>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="textLabel1_5">
           <property name="text">
-           <string>TLS</string>
+           <string>Email address:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1" colspan="2">
+         <widget class="QLineEdit" name="emailEdit">
+          <property name="toolTip">
+           <string>Enter your email address</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="textLabel1_6">
+          <property name="text">
+           <string>Signature:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1" colspan="2">
+         <widget class="QTextEdit" name="signatureEdit">
+          <property name="toolTip">
+           <string>Enter your email signature</string>
+          </property>
+          <property name="acceptRichText">
+           <bool>false</bool>
           </property>
          </widget>
         </item>
        </layout>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Port:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QSpinBox" name="portSpin">
-       <property name="toolTip">
-        <string>Enter the port of the mail server</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-       <property name="minimum">
-        <number>1</number>
-       </property>
-       <property name="maximum">
-        <number>65535</number>
-       </property>
-       <property name="value">
-        <number>25</number>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2">
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>138</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="textLabel1_5">
-       <property name="text">
-        <string>Email address:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1" colspan="2">
-      <widget class="QLineEdit" name="emailEdit">
-       <property name="toolTip">
-        <string>Enter your email address</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="textLabel1_6">
-       <property name="text">
-        <string>Signature:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1" colspan="2">
-      <widget class="QTextEdit" name="signatureEdit">
-       <property name="toolTip">
-        <string>Enter your email signature</string>
-       </property>
-       <property name="acceptRichText">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="mailAuthenticationGroup">
-     <property name="toolTip">
-      <string>Select to authenticatate against the mail server</string>
-     </property>
-     <property name="title">
-      <string>Mail server needs authentication</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="textLabel1_15">
-        <property name="text">
-         <string>Username:</string>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="mailAuthenticationGroup">
+        <property name="toolTip">
+         <string>Select to authenticatate against the mail server</string>
+        </property>
+        <property name="title">
+         <string>Mail server needs authentication</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="mailUserEdit">
-        <property name="toolTip">
-         <string>Enter your mail server username</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="textLabel2_7">
-        <property name="text">
-         <string>Password:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="mailPasswordEdit">
-        <property name="toolTip">
-         <string>Enter your password for accessing the mail server</string>
-        </property>
-        <property name="echoMode">
-         <enum>QLineEdit::Password</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QPushButton" name="testButton">
-        <property name="toolTip">
-         <string>Press to test the login data</string>
-        </property>
-        <property name="text">
-         <string>Test Login</string>
-        </property>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QLabel" name="textLabel1_15">
+           <property name="text">
+            <string>Username:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="mailUserEdit">
+           <property name="toolTip">
+            <string>Enter your mail server username</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="textLabel2_7">
+           <property name="text">
+            <string>Password:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="mailPasswordEdit">
+           <property name="toolTip">
+            <string>Enter your password for accessing the mail server</string>
+           </property>
+           <property name="echoMode">
+            <enum>QLineEdit::Password</enum>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0" colspan="2">
+          <widget class="QPushButton" name="testButton">
+           <property name="toolTip">
+            <string>Press to test the login data</string>
+           </property>
+           <property name="text">
+            <string>Test Login</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>
@@ -258,6 +293,7 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>googleMailCheckBox</tabstop>
   <tabstop>mailServerEdit</tabstop>
   <tabstop>noEncryptionButton</tabstop>
   <tabstop>useSslButton</tabstop>
@@ -271,5 +307,22 @@
   <tabstop>testButton</tabstop>
  </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>googleMailCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>groupBox</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>77</x>
+     <y>66</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>75</x>
+     <y>125</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
--- a/Preferences/__init__.py	Sun Jun 25 16:17:00 2017 +0200
+++ b/Preferences/__init__.py	Mon Jun 26 19:31:49 2017 +0200
@@ -1246,6 +1246,7 @@
         "MailServerEncryption": "No",   # valid values: No, SSL, TLS
         "MailServerPort": 25,
         "UseSystemEmailClient": False,
+        "UseGoogleMailOAuth2": False,
         "MasterPassword": "",           # stores the password hash
         "UseMasterPassword": False,
         "SavePasswords": False,
@@ -3100,7 +3101,7 @@
         return int(prefClass.settings.value(
             "User/" + key, prefClass.userDefaults[key]))
     elif key in ["MailServerAuthentication", "UseSystemEmailClient",
-                 "UseMasterPassword", "SavePasswords"]:
+                 "UseMasterPassword", "SavePasswords", "UseGoogleMailOAuth2"]:
         return toBool(prefClass.settings.value(
             "User/" + key, prefClass.userDefaults[key]))
     elif key == "MailServerEncryption":
--- a/Templates/TemplateHelpDialog.py	Sun Jun 25 16:17:00 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2015 - 2017 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Module implementing a dialog to show some template help.
-"""
-
-from __future__ import unicode_literals
-
-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog
-
-from .Ui_TemplateHelpDialog import Ui_TemplateHelpDialog
-
-
-class TemplateHelpDialog(QDialog, Ui_TemplateHelpDialog):
-    """
-    Class implementing a dialog to show some template help.
-    """
-    def __init__(self, parent=None):
-        """
-        Constructor
-        
-        @param parent reference to the parent widget
-        @type QWidget
-        """
-        super(TemplateHelpDialog, self).__init__(parent)
-        self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
-        
-        self.helpEdit.setHtml(self.tr(
-            """<p>To use variables in a template, you just have to"""
-            """ enclose the variablename with $-characters. When you"""
-            """ use the template, you will then be asked for a value"""
-            """ for this variable.</p>"""
-            """<p>Example template: This is a $VAR$</p>"""
-            """<p>When you use this template you will be prompted for"""
-            """ a value for the variable $VAR$. Any occurrences of $VAR$"""
-            """ will then be replaced with whatever you've entered.</p>"""
-            """<p>If you need a single $-character in a template, which"""
-            """ is not used to enclose a variable, type $$(two dollar"""
-            """ characters) instead. They will automatically be replaced"""
-            """ with a single $-character when you use the template.</p>"""
-            """<p>If you want a variables contents to be treated"""
-            """ specially, the variablename must be followed by a ':'"""
-            """ and one formatting specifier (e.g. $VAR:ml$). The"""
-            """ supported specifiers are:"""
-            """<table>"""
-            """<tr><td>ml</td><td>Specifies a multiline formatting."""
-            """ The first line of the variable contents is prefixed with"""
-            """ the string occurring before the variable on the same"""
-            """ line of the template. All other lines are prefixed by"""
-            """ the same amount of whitespace as the line containing"""
-            """ the variable."""
-            """</td></tr>"""
-            """<tr><td>rl</td><td>Specifies a repeated line formatting."""
-            """ Each line of the variable contents is prefixed with the"""
-            """ string occuring before the variable on the same line of"""
-            """ the template."""
-            """</td></tr>"""
-            """</table></p>"""
-            """<p>The following predefined variables may be used in a"""
-            """ template:"""
-            """<table>"""
-            """<tr><td>date</td>"""
-            """<td>today's date in ISO format (YYYY-MM-DD)</td></tr>"""
-            """<tr><td>year</td>"""
-            """<td>the current year</td></tr>"""
-            """<tr><td>project_name</td>"""
-            """<td>the name of the project (if any)</td></tr>"""
-            """<tr><td>project_path</td>"""
-            """<td>the path of the project (if any)</td></tr>"""
-            """<tr><td>path_name</td>"""
-            """<td>full path of the current file</td></tr>"""
-            """<tr><td>dir_name</td>"""
-            """<td>full path of the parent directory</td></tr>"""
-            """<tr><td>file_name</td>"""
-            """<td>the current file name (without directory)</td></tr>"""
-            """<tr><td>base_name</td>"""
-            """<td>like <i>file_name</i>, but without extension"""
-            """</td></tr>"""
-            """<tr><td>ext</td>"""
-            """<td>the extension of the current file</td></tr>"""
-            """<tr><td>cur_select</td>"""
-            """<td>the currently selected text</td></tr>"""
-            """<tr><td>insertion</td>"""
-            """<td>Sets insertion point for cursor after template is"""
-            """ inserted.</td>"""
-            """</tr>"""
-            """<tr><td>select_start</td>"""
-            """<td>Sets span of selected text in template after template"""
-            """ is inserted (used together with 'select_end').</td></tr>"""
-            """<tr><td>select_end</td>"""
-            """<td>Sets span of selected text in template after template"""
-            """ is inserted (used together with 'select_start')."""
-            """</td></tr>"""
-            """<tr><td>clipboard</td>"""
-            """<td>the text of the clipboard</td></tr>"""
-            """</table></p>"""
-            """<p>If you want to change the default delimiter to"""
-            """ anything different, please use the configuration"""
-            """ dialog to do so.</p>"""
-        ))
--- a/Templates/TemplateHelpDialog.ui	Sun Jun 25 16:17:00 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TemplateHelpDialog</class>
- <widget class="QDialog" name="TemplateHelpDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>500</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Template Help</string>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>true</bool>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>&lt;b&gt;Template Help&lt;/b&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTextEdit" name="helpEdit">
-     <property name="tabChangesFocus">
-      <bool>true</bool>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>TemplateHelpDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>TemplateHelpDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
--- a/Templates/TemplatePropertiesDialog.py	Sun Jun 25 16:17:00 2017 +0200
+++ b/Templates/TemplatePropertiesDialog.py	Mon Jun 26 19:31:49 2017 +0200
@@ -113,8 +113,89 @@
         Private slot to show some help.
         """
         if self.__helpDialog is None:
-            from .TemplateHelpDialog import TemplateHelpDialog
-            self.__helpDialog = TemplateHelpDialog(self)
+            from E5Gui.E5SimpleHelpDialog import E5SimpleHelpDialog
+            self.__helpDialog = E5SimpleHelpDialog(
+                title=self.tr("Template Help"),
+                label=self.tr("<b>Template Help</b>"),
+                help=self.tr(
+                    """<p>To use variables in a template, you just have to"""
+                    """ enclose the variablename with $-characters. When you"""
+                    """ use the template, you will then be asked for a value"""
+                    """ for this variable.</p>"""
+                    """<p>Example template: This is a $VAR$</p>"""
+                    """<p>When you use this template you will be prompted"""
+                    """ for a value for the variable $VAR$. Any occurrences"""
+                    """ of $VAR$ will then be replaced with whatever you've"""
+                    """ entered.</p>"""
+                    """<p>If you need a single $-character in a template,"""
+                    """ which is not used to enclose a variable, type"""
+                    """ $$(two dollar characters) instead. They will"""
+                    """ automatically be replaced with a single $-character"""
+                    """ when you use the template.</p>"""
+                    """<p>If you want a variables contents to be treated"""
+                    """ specially, the variablename must be followed by a"""
+                    """ ': and one formatting specifier (e.g. $VAR:ml$). The"""
+                    """ supported specifiers are:"""
+                    """<table>"""
+                    """<tr><td>ml</td><td>Specifies a multiline formatting."""
+                    """ The first line of the variable contents is prefixed"""
+                    """ with the string occurring before the variable on"""
+                    """ the same line of the template. All other lines are"""
+                    """ prefixed by the same amount of whitespace as the"""
+                    """ line containing the variable."""
+                    """</td></tr>"""
+                    """<tr><td>rl</td><td>Specifies a repeated line"""
+                    """ formatting. Each line of the variable contents is"""
+                    """ prefixed with the string occuring before the"""
+                    """ variable on the same line of the template."""
+                    """</td></tr>"""
+                    """</table></p>"""
+                    """<p>The following predefined variables may be used"""
+                    """ in a template:"""
+                    """<table>"""
+                    """<tr><td>date</td>"""
+                    """<td>today's date in ISO format (YYYY-MM-DD)</td></tr>"""
+                    """<tr><td>year</td>"""
+                    """<td>the current year</td></tr>"""
+                    """<tr><td>project_name</td>"""
+                    """<td>the name of the project (if any)</td></tr>"""
+                    """<tr><td>project_path</td>"""
+                    """<td>the path of the project (if any)</td></tr>"""
+                    """<tr><td>path_name</td>"""
+                    """<td>full path of the current file</td></tr>"""
+                    """<tr><td>dir_name</td>"""
+                    """<td>full path of the parent directory</td></tr>"""
+                    """<tr><td>file_name</td>"""
+                    """<td>the current file name (without directory)"""
+                    """</td></tr>"""
+                    """<tr><td>base_name</td>"""
+                    """<td>like <i>file_name</i>, but without extension"""
+                    """</td></tr>"""
+                    """<tr><td>ext</td>"""
+                    """<td>the extension of the current file</td></tr>"""
+                    """<tr><td>cur_select</td>"""
+                    """<td>the currently selected text</td></tr>"""
+                    """<tr><td>insertion</td>"""
+                    """<td>Sets insertion point for cursor after template is"""
+                    """ inserted.</td>"""
+                    """</tr>"""
+                    """<tr><td>select_start</td>"""
+                    """<td>Sets span of selected text in template after"""
+                    """ template is inserted (used together with"""
+                    """ 'select_end').</td></tr>"""
+                    """<tr><td>select_end</td>"""
+                    """<td>Sets span of selected text in template after"""
+                    """ template is inserted (used together with"""
+                    """ 'select_start')."""
+                    """</td></tr>"""
+                    """<tr><td>clipboard</td>"""
+                    """<td>the text of the clipboard</td></tr>"""
+                    """</table></p>"""
+                    """<p>If you want to change the default delimiter to"""
+                    """ anything different, please use the configuration"""
+                    """ dialog to do so.</p>"""
+                ),
+                parent=self)
         self.__helpDialog.show()
         
     def setSelectedGroup(self, name):
--- a/UI/EmailDialog.py	Sun Jun 25 16:17:00 2017 +0200
+++ b/UI/EmailDialog.py	Mon Jun 26 19:31:49 2017 +0200
@@ -4,7 +4,7 @@
 #
 
 """
-Module implementing a dialog to send bug reports.
+Module implementing a dialog to send bug reports or feature requests.
 """
 
 from __future__ import unicode_literals
@@ -64,7 +64,7 @@
 
 class EmailDialog(QDialog, Ui_EmailDialog):
     """
-    Class implementing a dialog to send bug reports.
+    Class implementing a dialog to send bug reports or feature requests.
     """
     def __init__(self, mode="bug", parent=None):
         """
@@ -96,6 +96,9 @@
         self.sendButton.setEnabled(False)
         self.sendButton.setDefault(True)
         
+        self.googleHelpButton = self.buttonBox.addButton(
+            self.tr("Google Mail API Help"), QDialogButtonBox.HelpRole)
+        
         height = self.height()
         self.mainSplitter.setSizes([int(0.7 * height), int(0.3 * height)])
         
@@ -117,6 +120,8 @@
         
         self.__deleteFiles = []
         
+        self.__helpDialog = None
+    
     def keyPressEvent(self, ev):
         """
         Protected method to handle the user pressing the escape key.
@@ -139,6 +144,8 @@
         """
         if button == self.sendButton:
             self.on_sendButton_clicked()
+        elif button == self.googleHelpButton:
+            self.on_googleHelpButton_clicked()
         
     def on_buttonBox_rejected(self):
         """
@@ -150,7 +157,29 @@
             self.tr("""Do you really want to close the dialog?"""))
         if res:
             self.reject()
+    
+    @pyqtSlot()
+    def on_googleHelpButton_clicked(self):
+        """
+        Private slot to show some help text "how to turn on the Gmail API".
+        """
+        if self.__helpDialog is None:
+            try:
+                from E5Network.E5GoogleMail import GoogleMailHelp
+                help = GoogleMailHelp()
+            except ImportError:
+                help = self.tr(
+                    "<p>The Google Mail Client API is not installed."
+                    " Use <code>pip install --upgrade google-api-python-client"
+                    "</code> to install it.</p>")
+            
+            from E5Gui.E5SimpleHelpDialog import E5SimpleHelpDialog
+            self.__helpDialog = E5SimpleHelpDialog(
+                title=self.tr("Gmail API Help"),
+                help=help, parent=self)
         
+        self.__helpDialog.show()
+    
     @pyqtSlot()
     def on_sendButton_clicked(self):
         """
@@ -160,8 +189,11 @@
             msg = self.__createMultipartMail()
         else:
             msg = self.__createSimpleMail()
-            
-        ok = self.__sendmail(msg)
+        
+        if Preferences.getUser("UseGoogleMailOAuth2"):
+            ok = self.__sendmailGoogle(msg)
+        else:
+            ok = self.__sendmail(msg.as_string())
         
         if ok:
             for f in self.__deleteFiles:
@@ -203,7 +235,8 @@
         """
         Private method to create a simple mail message.
         
-        @return string containing the mail message
+        @return prepared mail message
+        @rtype email.mime.text.MIMEText
         """
         msgtext = "{0}\r\n----\r\n{1}----\r\n{2}----\r\n{3}".format(
             self.message.toPlainText(),
@@ -217,13 +250,14 @@
         subject = '[eric6] {0}'.format(self.subject.text())
         msg['Subject'] = self.__encodedHeader(subject)
         
-        return msg.as_string()
+        return msg
         
     def __createMultipartMail(self):
         """
         Private method to create a multipart mail message.
         
-        @return string containing the mail message
+        @return prepared mail message
+        @rtype email.mime.text.MIMEMultipart
         """
         mpPreamble = ("This is a MIME-encoded message with attachments. "
                       "If you see this message, your mail client is not "
@@ -273,7 +307,7 @@
             att.add_header('Content-Disposition', 'attachment', filename=name)
             msg.attach(att)
             
-        return msg.as_string()
+        return msg
 
     def __sendmail(self, msg):
         """
@@ -320,7 +354,7 @@
                         errorStr = str(e)
                     res = E5MessageBox.retryAbort(
                         self,
-                        self.tr("Send bug report"),
+                        self.tr("Send Message"),
                         self.tr(
                             """<p>Authentication failed.<br>Reason: {0}</p>""")
                         .format(errorStr),
@@ -348,7 +382,7 @@
                 errorStr = str(e)
             res = E5MessageBox.retryAbort(
                 self,
-                self.tr("Send bug report"),
+                self.tr("Send Message"),
                 self.tr(
                     """<p>Message could not be sent.<br>Reason: {0}</p>""")
                 .format(errorStr),
@@ -358,7 +392,34 @@
             else:
                 return False
         return True
+    
+
+    def __sendmailGoogle(self, msg):
+        """
+        Private method to actually send the message via Google Mail.
         
+        @param message email message to be sent
+        @type email.mime.text.MIMEBase
+        @return flag indicating success
+        @rtype bool
+        """
+        from E5Network.E5GoogleMail import GoogleMailSendMessage
+        QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+        QApplication.processEvents()
+        ok, result = GoogleMailSendMessage(msg)
+        QApplication.restoreOverrideCursor()
+        if not ok:
+            # we got an error
+            E5MessageBox.critical(
+                self,
+                self.tr("Send Message"),
+                self.tr(
+                    """<p>Message could not be sent.<br>Reason: {0}</p>""")
+                .format(result)
+            )
+        
+        return ok
+    
     @pyqtSlot()
     def on_addButton_clicked(self):
         """
--- a/changelog	Sun Jun 25 16:17:00 2017 +0200
+++ b/changelog	Mon Jun 26 19:31:49 2017 +0200
@@ -5,6 +5,9 @@
 - Background Services
   -- added functionality to limit the number of processes used for background
      services
+- Bug Reporting / Feature Request (Email)
+  -- added the capability to send these emails via Google Mail using OAuth2
+     authentication
 - Configuration
   -- made the colors of the diff dialogs configurable
 - Third Party packages
--- a/eric6.e4p	Sun Jun 25 16:17:00 2017 +0200
+++ b/eric6.e4p	Mon Jun 26 19:31:49 2017 +0200
@@ -135,6 +135,7 @@
     <Source>E5Gui/E5PathPicker.py</Source>
     <Source>E5Gui/E5ProgressDialog.py</Source>
     <Source>E5Gui/E5SideBar.py</Source>
+    <Source>E5Gui/E5SimpleHelpDialog.py</Source>
     <Source>E5Gui/E5SingleApplication.py</Source>
     <Source>E5Gui/E5SqueezeLabels.py</Source>
     <Source>E5Gui/E5StringListEditWidget.py</Source>
@@ -152,6 +153,7 @@
     <Source>E5Gui/E5ZoomWidget.py</Source>
     <Source>E5Gui/__init__.py</Source>
     <Source>E5Network/E5Ftp.py</Source>
+    <Source>E5Network/E5GoogleMail.py</Source>
     <Source>E5Network/E5NetworkHeaderDetailsDialog.py</Source>
     <Source>E5Network/E5NetworkIcon.py</Source>
     <Source>E5Network/E5NetworkMonitor.py</Source>
@@ -926,7 +928,6 @@
     <Source>Tasks/TaskPropertiesDialog.py</Source>
     <Source>Tasks/TaskViewer.py</Source>
     <Source>Tasks/__init__.py</Source>
-    <Source>Templates/TemplateHelpDialog.py</Source>
     <Source>Templates/TemplateMultipleVariablesDialog.py</Source>
     <Source>Templates/TemplatePropertiesDialog.py</Source>
     <Source>Templates/TemplateSingleVariableDialog.py</Source>
@@ -1555,6 +1556,7 @@
     <Form>Debugger/VariablesFilterDialog.ui</Form>
     <Form>E5Gui/E5ErrorMessageFilterDialog.ui</Form>
     <Form>E5Gui/E5ListSelectionDialog.ui</Form>
+    <Form>E5Gui/E5SimpleHelpDialog.ui</Form>
     <Form>E5Gui/E5StringListEditWidget.ui</Form>
     <Form>E5Gui/E5TextEditSearchWidget.ui</Form>
     <Form>E5Gui/E5ToolBarDialog.ui</Form>
@@ -1774,13 +1776,13 @@
     <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.ui</Form>
     <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui</Form>
     <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.ui</Form>
-    <Form>Preferences/ConfigurationPages/DiffColoursPage.ui</Form>
     <Form>Preferences/ConfigurationPages/ApplicationPage.ui</Form>
     <Form>Preferences/ConfigurationPages/CooperationPage.ui</Form>
     <Form>Preferences/ConfigurationPages/CorbaPage.ui</Form>
     <Form>Preferences/ConfigurationPages/DebuggerGeneralPage.ui</Form>
     <Form>Preferences/ConfigurationPages/DebuggerPython3Page.ui</Form>
     <Form>Preferences/ConfigurationPages/DebuggerPythonPage.ui</Form>
+    <Form>Preferences/ConfigurationPages/DiffColoursPage.ui</Form>
     <Form>Preferences/ConfigurationPages/EditorAPIsPage.ui</Form>
     <Form>Preferences/ConfigurationPages/EditorAutocompletionPage.ui</Form>
     <Form>Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui</Form>
@@ -1875,7 +1877,6 @@
     <Form>SqlBrowser/SqlConnectionDialog.ui</Form>
     <Form>Tasks/TaskFilterConfigDialog.ui</Form>
     <Form>Tasks/TaskPropertiesDialog.ui</Form>
-    <Form>Templates/TemplateHelpDialog.ui</Form>
     <Form>Templates/TemplatePropertiesDialog.ui</Form>
     <Form>Templates/TemplateSingleVariableDialog.ui</Form>
     <Form>UI/AuthenticationDialog.ui</Form>
--- a/i18n/eric6_cs.ts	Sun Jun 25 16:17:00 2017 +0200
+++ b/i18n/eric6_cs.ts	Mon Jun 26 19:31:49 2017 +0200
@@ -14047,7 +14047,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation>Odeslat hlášení o chybách</translation>
     </message>
@@ -14107,27 +14107,27 @@
         <translation>Odeslat</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Close dialog</source>
         <translation>Zavřít dialog</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Opravdu chcete zavřít dialog?</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Mail Server Password</source>
         <translation>Heslo mail serveru</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Enter your mail server password</source>
         <translation>Zadejte heslo vašeho mail serveru</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="368"/>
+        <location filename="../UI/EmailDialog.py" line="429"/>
         <source>Attach file</source>
         <translation>Připojit soubor</translation>
     </message>
@@ -14157,15 +14157,35 @@
         <translation>Poslat požadavek na vlastnost</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="322"/>
+        <location filename="../UI/EmailDialog.py" line="356"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Autentizace selhala.&lt;br&gt;Důvod: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.py" line="414"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zprávu nelze odeslat.&lt;br&gt;Důvod: {0}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="99"/>
+        <source>Google Mail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="171"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="177"/>
+        <source>Gmail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="414"/>
+        <source>Send Message</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailPage</name>
@@ -14175,62 +14195,62 @@
         <translation>&lt;b&gt;Konfigurovat email&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="257"/>
         <source>Enter your password for accessing the mail server</source>
         <translation>Zadejte vaše heslo pro přístup na mail server</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="243"/>
         <source>Enter your mail server username</source>
         <translation>Zadejte vaše přihlašovací jméno na mail server</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="202"/>
         <source>Signature:</source>
         <translation>Podpis:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="78"/>
         <source>Enter the address of your mail server</source>
         <translation>Zadejte adresu vašeho mail serveru</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="188"/>
         <source>Email address:</source>
         <translation>Email adresa:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="212"/>
         <source>Enter your email signature</source>
         <translation>Zadejte váš email podpis</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
-        <source>Enter your email address</source>
-        <translation>Zadejte vaši emailovou adresu</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
-        <source>Select to authenticatate against the mail server</source>
-        <translation>Výběr autentizace proti mail serveru</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
+        <source>Enter your email address</source>
+        <translation>Zadejte vaši emailovou adresu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="224"/>
+        <source>Select to authenticatate against the mail server</source>
+        <translation>Výběr autentizace proti mail serveru</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="227"/>
         <source>Mail server needs authentication</source>
         <translation>Mail server požaduje autentizaci</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="236"/>
         <source>Username:</source>
         <translation>Přihlašovací jméno:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="250"/>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="136"/>
         <source>Select to use TLS</source>
         <translation>Vybrat pro použití TLS</translation>
     </message>
@@ -14240,12 +14260,12 @@
         <translation type="obsolete">Použít TLS</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
         <source>Enter the port of the mail server</source>
         <translation>Zadejte port mail serveru</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="71"/>
         <source>Outgoing mail server (SMTP):</source>
         <translation>Odchozí mail server (SMTP):</translation>
     </message>
@@ -14255,65 +14275,90 @@
         <translation type="obsolete">Odchozí mail server port:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="267"/>
         <source>Press to test the login data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="270"/>
         <source>Test Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>Login Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="221"/>
         <source>The login test succeeded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="85"/>
         <source>Encryption Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="113"/>
         <source>Select to use no encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="126"/>
         <source>Select to use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="129"/>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="139"/>
         <source>TLS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="149"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="37"/>
+        <source>Google Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="43"/>
+        <source>Use Google Mail with OAuth2 authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="50"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="63"/>
+        <source>Standard Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="48"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -40976,27 +41021,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1563"/>
+        <location filename="../Preferences/__init__.py" line="1564"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61087,17 +61132,12 @@
     <message>
         <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
         <source>Template Help</source>
-        <translation type="unfinished">Nápověda šablony</translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
-        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Nápověda šablony</translation>
     </message>
     <message>
         <location filename="../Templates/TemplateHelpDialog.py" line="33"/>
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Proměnné se v šablonách používají tak, že se jejich jména vloží mezi $ znaky. Když je v šabloně použiteje, budete vyzváni k zadání hodnoty proměnné.&lt;/p&gt;&lt;p&gt;Příklad šablony: Toto je $VAR$&lt;/p&gt;&lt;p&gt;Když použiteje tuto šablonu, budete vyzváni k zadání hodnoty proměnné $VAR$. Všechny výskyty $VAR$ pak budou nahrazeny touto hodnotou.&lt;/p&gt;&lt;p&gt;Pokud chcete do šablony umístit pouze znak $, zadejte jej zdvojeně: $$. Takovýto výskyt bude automaticky nahrazen na jeden znak $.&lt;/p&gt;&lt;p&gt;Pokud chcete proměnnou nějak formátovat, zadejte &apos;:&apos; a pak název filtru. (např. $VAR:ml$) Podporované filtry jsou:&lt;table&gt;&lt;tr&gt;    &lt;td&gt;ml&lt;/td&gt;    &lt;td&gt;Víceřádkové formátování. První řádek s hodnotou proměnné začíná s textem, který na tom samém řádku předcházel proměnnou. Všechny ostatní řádky dané hodnoty jsou zleva doplněny mezerami tak, aby byly zarovnány pod začátek hodnoty na prvním řádku.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;    &lt;td&gt;rl&lt;/td&gt;    &lt;td&gt;Formátování s opakováním. Každá řádka hodnoty začíná s textem, který na tom samém řádku předcházel proměnnou.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;V šablonách lze použít následující předdefinované proměnné:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;aktuální datum v ISO formátu (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;aktuální rok&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;jméno projektu (je-li nějaké)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;cesta k projektu (je-li nějaká)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;celá cesta k aktuálnímu souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;celá cesta k nadřazené složce&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;jméno aktuálního souboru (bez cesty)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;stejně jako &lt;i&gt;file_name&lt;/i&gt;, ale bez extenze&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;extenze aktuálního souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;kurzorem vybraný text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Nastaví pozici kurzoru po té, co je šablona vložena.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;obsah schránky&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Chcete-li změnit výchozí oddělovač na něco jiného, prosím, použijte dialog nastavení konfigurace.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Proměnné se v šablonách používají tak, že se jejich jména vloží mezi $ znaky. Když je v šabloně použiteje, budete vyzváni k zadání hodnoty proměnné.&lt;/p&gt;&lt;p&gt;Příklad šablony: Toto je $VAR$&lt;/p&gt;&lt;p&gt;Když použiteje tuto šablonu, budete vyzváni k zadání hodnoty proměnné $VAR$. Všechny výskyty $VAR$ pak budou nahrazeny touto hodnotou.&lt;/p&gt;&lt;p&gt;Pokud chcete do šablony umístit pouze znak $, zadejte jej zdvojeně: $$. Takovýto výskyt bude automaticky nahrazen na jeden znak $.&lt;/p&gt;&lt;p&gt;Pokud chcete proměnnou nějak formátovat, zadejte &apos;:&apos; a pak název filtru. (např. $VAR:ml$) Podporované filtry jsou:&lt;table&gt;&lt;tr&gt;    &lt;td&gt;ml&lt;/td&gt;    &lt;td&gt;Víceřádkové formátování. První řádek s hodnotou proměnné začíná s textem, který na tom samém řádku předcházel proměnnou. Všechny ostatní řádky dané hodnoty jsou zleva doplněny mezerami tak, aby byly zarovnány pod začátek hodnoty na prvním řádku.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;    &lt;td&gt;rl&lt;/td&gt;    &lt;td&gt;Formátování s opakováním. Každá řádka hodnoty začíná s textem, který na tom samém řádku předcházel proměnnou.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;V šablonách lze použít následující předdefinované proměnné:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;aktuální datum v ISO formátu (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;aktuální rok&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;jméno projektu (je-li nějaké)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;cesta k projektu (je-li nějaká)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;celá cesta k aktuálnímu souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;celá cesta k nadřazené složce&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;jméno aktuálního souboru (bez cesty)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;stejně jako &lt;i&gt;file_name&lt;/i&gt;, ale bez extenze&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;extenze aktuálního souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;kurzorem vybraný text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Nastaví pozici kurzoru po té, co je šablona vložena.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;obsah schránky&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Chcete-li změnit výchozí oddělovač na něco jiného, prosím, použijte dialog nastavení konfigurace.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -61181,9 +61221,9 @@
         <translation>Opravdu chcete zavřít dialog?</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
         <source>Template Help</source>
-        <translation type="obsolete">Nápověda šablony</translation>
+        <translation type="unfinished">Nápověda šablony</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="86"/>
@@ -61219,6 +61259,16 @@
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Proměnné se v šablonách používají tak, že se jejich jména vloží mezi $ znaky. Když je v šabloně použiteje, budete vyzváni k zadání hodnoty proměnné.&lt;/p&gt;&lt;p&gt;Příklad šablony: Toto je $VAR$&lt;/p&gt;&lt;p&gt;Když použiteje tuto šablonu, budete vyzváni k zadání hodnoty proměnné $VAR$. Všechny výskyty $VAR$ pak budou nahrazeny touto hodnotou.&lt;/p&gt;&lt;p&gt;Pokud chcete do šablony umístit pouze znak $, zadejte jej zdvojeně: $$. Takovýto výskyt bude automaticky nahrazen na jeden znak $.&lt;/p&gt;&lt;p&gt;Pokud chcete proměnnou nějak formátovat, zadejte &apos;:&apos; a pak název filtru. (např. $VAR:ml$) Podporované filtry jsou:&lt;table&gt;&lt;tr&gt;    &lt;td&gt;ml&lt;/td&gt;    &lt;td&gt;Víceřádkové formátování. První řádek s hodnotou proměnné začíná s textem, který na tom samém řádku předcházel proměnnou. Všechny ostatní řádky dané hodnoty jsou zleva doplněny mezerami tak, aby byly zarovnány pod začátek hodnoty na prvním řádku.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;    &lt;td&gt;rl&lt;/td&gt;    &lt;td&gt;Formátování s opakováním. Každá řádka hodnoty začíná s textem, který na tom samém řádku předcházel proměnnou.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;V šablonách lze použít následující předdefinované proměnné:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;aktuální datum v ISO formátu (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;aktuální rok&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;jméno projektu (je-li nějaké)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;cesta k projektu (je-li nějaká)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;celá cesta k aktuálnímu souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;celá cesta k nadřazené složce&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;jméno aktuálního souboru (bez cesty)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;stejně jako &lt;i&gt;file_name&lt;/i&gt;, ale bez extenze&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;extenze aktuálního souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;kurzorem vybraný text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Nastaví pozici kurzoru po té, co je šablona vložena.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;obsah schránky&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Chcete-li změnit výchozí oddělovač na něco jiného, prosím, použijte dialog nastavení konfigurace.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;: and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -71735,7 +71785,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3417"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71812,7 +71862,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>New Private Window</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71838,7 +71888,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>Open File</source>
         <translation type="unfinished">Otevřít soubor</translation>
     </message>
@@ -71970,7 +72020,7 @@
         <translation type="unfinished">&lt;b&gt;Export záložek&lt;/b&gt;&lt;p&gt;Export záložek do souboru.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2089"/>
         <source>Print</source>
         <translation type="unfinished">Tisk</translation>
     </message>
@@ -73329,17 +73379,17 @@
         <translation type="unfinished">S&amp;oubor</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1921"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1922"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edit</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2139"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2144"/>
         <source>&amp;View</source>
         <translation type="unfinished">Poh&amp;led</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1947"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1949"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73349,27 +73399,27 @@
         <translation type="obsolete">&amp;Jít</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1958"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1961"/>
         <source>H&amp;istory</source>
         <translation type="unfinished">H&amp;istorie</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1974"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1978"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished">&amp;Záložky</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1990"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1994"/>
         <source>&amp;Settings</source>
         <translation type="unfinished">Na&amp;stavení</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2020"/>
         <source>Global User Agent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2169"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2174"/>
         <source>&amp;Tools</source>
         <translation type="unfinished">&amp;Nástroje</translation>
     </message>
@@ -73379,52 +73429,52 @@
         <translation type="obsolete">O&amp;kno</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2057"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2061"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2193"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2198"/>
         <source>File</source>
         <translation type="unfinished">Soubor</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2225"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2230"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2238"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2243"/>
         <source>View</source>
         <translation type="unfinished">Pohled</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2248"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2253"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2257"/>
-        <source>Filter</source>
-        <translation type="unfinished">Filtr</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2262"/>
+        <source>Filter</source>
+        <translation type="unfinished">Filtr</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2267"/>
         <source>Filtered by: </source>
         <translation type="unfinished">Filtrováno: </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2275"/>
         <source>Settings</source>
         <translation type="unfinished">Nastavení</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2282"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2287"/>
         <source>Tools</source>
         <translation type="unfinished">Nástroje</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2291"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2296"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73434,7 +73484,7 @@
         <translation type="obsolete">Jít</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2298"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2303"/>
         <source>VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73444,22 +73494,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>&lt;p&gt;Could not start the process.&lt;br&gt;Ensure that it is available as &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -73469,93 +73519,93 @@
         <translation type="obsolete">Help soubory (*.html *.htm);;PDF soubory (*.pdf);;CHM soubory (*.chm);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2510"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2515"/>
         <source>&lt;b&gt;eric6 Web Browser - {0}&lt;/b&gt;&lt;p&gt;The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.&lt;/p&gt;&lt;p&gt;It is based on QtWebEngine {1} and Chrome {2}.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2634"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2639"/>
         <source>Saved Tabs</source>
         <translation type="unfinished">Uložkt taby</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3234"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3239"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished">Asociovaný obsah nelze nalézt.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3337"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3342"/>
         <source>Updating search index</source>
         <translation type="unfinished">Aktualizovat index pro hledání</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3407"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3412"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished">Vyhledat dokumentaci...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3442"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3447"/>
         <source>Unfiltered</source>
         <translation type="unfinished">Nefiltrováno</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3461"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3466"/>
         <source>Help Engine</source>
         <translation type="unfinished">Engine nápovědy</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4014"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4019"/>
         <source>ISO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4018"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4023"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4020"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4025"/>
         <source>ISCII</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4021"/>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4024"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4029"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4022"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4027"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4467"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4472"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73627,7 +73677,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73642,52 +73692,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2175"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2180"/>
         <source>&amp;VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2141"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2146"/>
         <source>&amp;Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2051"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2055"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished">&amp;Toolbary</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2077"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2082"/>
         <source>Save</source>
         <translation type="unfinished">Uložit</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2097"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2102"/>
         <source>Show All History...</source>
         <translation type="unfinished">Zobrazit celou historii...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4049"/>
-        <source>Menu Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4054"/>
-        <source>Bookmarks</source>
-        <translation type="unfinished">Záložky</translation>
+        <source>Menu Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4059"/>
+        <source>Bookmarks</source>
+        <translation type="unfinished">Záložky</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4064"/>
         <source>Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4073"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4078"/>
         <source>&amp;Show all</source>
         <translation type="unfinished">&amp;Zobrazit vše</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4075"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4080"/>
         <source>&amp;Hide all</source>
         <translation type="unfinished">&amp;Skrýt vše</translation>
     </message>
--- a/i18n/eric6_de.ts	Sun Jun 25 16:17:00 2017 +0200
+++ b/i18n/eric6_de.ts	Mon Jun 26 19:31:49 2017 +0200
@@ -13698,32 +13698,32 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation>Sende Fehlerbericht</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="368"/>
+        <location filename="../UI/EmailDialog.py" line="429"/>
         <source>Attach file</source>
         <translation>Datei anhängen</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.py" line="414"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nachricht konnte nicht gesendet werden.&lt;br&gt;Grund: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Mail Server Password</source>
         <translation>Mail Server Kennwort</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Enter your mail server password</source>
         <translation>Geben Sie Ihr Mailserver-Kennwort ein</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="322"/>
+        <location filename="../UI/EmailDialog.py" line="356"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Autorisierung fehlgeschlagen.&lt;br&gt;Grund: {0}&lt;/p&gt;</translation>
     </message>
@@ -13783,12 +13783,12 @@
         <translation>Senden</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Close dialog</source>
         <translation>Dialog schließen</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Soll der Dialog wirklich geschlossen werden?</translation>
     </message>
@@ -13817,61 +13817,81 @@
         <source>Send feature request</source>
         <translation>Sende Anfrage für neue Funktion</translation>
     </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="99"/>
+        <source>Google Mail API Help</source>
+        <translation>Google Mail API Hilfe</translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="171"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Das Google Mail Client API ist nicht installiert. Führe &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; aus, um es zu installieren.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="177"/>
+        <source>Gmail API Help</source>
+        <translation>Gmail API Hilfe</translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="414"/>
+        <source>Send Message</source>
+        <translation>Nachricht senden</translation>
+    </message>
 </context>
 <context>
     <name>EmailPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="257"/>
         <source>Enter your password for accessing the mail server</source>
         <translation>Geben Sie das Kennwort zum Zugriff auf den Mailserver ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="243"/>
         <source>Enter your mail server username</source>
         <translation>Geben Sie Ihren Mailserver-Nutzernamen ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="202"/>
         <source>Signature:</source>
         <translation>Signatur:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="78"/>
         <source>Enter the address of your mail server</source>
         <translation>Gib die Adresse des E-Mail-Servers ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="188"/>
         <source>Email address:</source>
         <translation>E-Mail-Adresse:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="212"/>
         <source>Enter your email signature</source>
         <translation>Gib die E-Mail-Signatur ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
-        <source>Enter your email address</source>
-        <translation>Gib die E-Mail-Adresse ein</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
-        <source>Select to authenticatate against the mail server</source>
-        <translation>Auswählen, wenn der Mailserver eine Autorisierung verlangt</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
+        <source>Enter your email address</source>
+        <translation>Gib die E-Mail-Adresse ein</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="224"/>
+        <source>Select to authenticatate against the mail server</source>
+        <translation>Auswählen, wenn der Mailserver eine Autorisierung verlangt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="227"/>
         <source>Mail server needs authentication</source>
         <translation>Mailserver verlangt Autorisierung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="236"/>
         <source>Username:</source>
         <translation>Nutzername:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="250"/>
         <source>Password:</source>
         <translation>Kennwort:</translation>
     </message>
@@ -13881,80 +13901,105 @@
         <translation>&lt;b&gt;E-Mail-Einstellungen&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="136"/>
         <source>Select to use TLS</source>
         <translation>Auswählen, um TLS zu verwenden</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
         <source>Enter the port of the mail server</source>
         <translation>Gibt den Port des E-Mail-Servers ein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="71"/>
         <source>Outgoing mail server (SMTP):</source>
         <translation>Ausgangsmailserver (SMTP):</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="267"/>
         <source>Press to test the login data</source>
         <translation>Drücken, um die Anmeldedaten zu testen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="270"/>
         <source>Test Login</source>
         <translation>Anmeldung testen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>Login Test</source>
         <translation>Anmeldetest</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="221"/>
         <source>The login test succeeded.</source>
         <translation>Der Anmeldetest war erfolgreich.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Anmeldetest ist fehlgeschlagen.&lt;br&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="85"/>
         <source>Encryption Method:</source>
         <translation>Verschlüsselungsmethode:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="113"/>
         <source>Select to use no encryption</source>
         <translation>Auswählen, um keine Verschlüsselung zu verwenden</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
         <source>None</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="126"/>
         <source>Select to use SSL</source>
         <translation>Auswählen, um SSL zu verwenden</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="129"/>
         <source>SSL</source>
         <translation>SSL</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="139"/>
         <source>TLS</source>
         <translation>TLS</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="149"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="37"/>
+        <source>Google Mail</source>
+        <translation>Google Mail</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="43"/>
+        <source>Use Google Mail with OAuth2 authentication</source>
+        <translation>Verwende Google Mail mit OAuth2 Authentisierung</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="50"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</source>
+        <translation>&lt;b&gt;Hinweis:&lt;/b&gt; Google Mail über SMTP muss unten konfiguriert werden.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="63"/>
+        <source>Standard Email</source>
+        <translation>Normale Email</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="48"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Das Google Mail Client API ist nicht installiert. Führe &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; aus, um es zu installieren.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -40065,27 +40110,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1563"/>
+        <location filename="../Preferences/__init__.py" line="1564"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
@@ -59920,24 +59965,6 @@
     </message>
 </context>
 <context>
-    <name>TemplateHelpDialog</name>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
-        <source>Template Help</source>
-        <translation>Hilfe zu Vorlagen</translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
-        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Hilfe zu Vorlagen&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.py" line="33"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Um Variablen in einer Vorlage zu verwenden, muss der Variablenname mit einem $-Zeichen umschlossen werden. Wenn die Vorlage angewandt wird, wird nach einem Wert für diese Variable gefragt.&lt;/p&gt;&lt;p&gt;Beispiel: Dies ist eine $Variable$&lt;/p&gt;&lt;p&gt;Wenn diese Vorlage angewandt wird, wird nach einem Wert für die Variable $Variable$ gefragt. Jedes Vorkommen von $Variable$ wird dann durch den eingegebenen Text ersetzt.&lt;/p&gt;&lt;p&gt;Wird in der Vorlage ein einzelnes $-Zeichen, das keine Variable umschließt, benötigt, so muss dies als $$ (zwei Dollar Zeichen) geschrieben werden. Bei der Anwendung der Vorlage wird dies automatisch zu einem $-Zeichen.&lt;/p&gt;&lt;p&gt;Soll der Wert einer Variablen speziell behandelt werden, so muss dem Variablennamen ein „:“ und eine Formatangabe folgen (z.B. $Variable:ml$). Die unterstützten Formatangaben sind:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Gibt ein mehrzeiliges Format an. Der ersten Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt. Allen anderen wird soviel Leerraum vorangestellt, wie die Zeile der Variablen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Gibt ein wiederholendes Format an. Jede Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Die folgenden vordefinierten Variablen können in einer Vorlage verwendet werden:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;das aktuelle Datum im ISO-Format (JJJJ-MM-TT)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;das aktuelle Jahr&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;der Name des Projektes (falls vorhanden)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;der Pfad des Projektes (falls vorhanden)/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;voller Pfadname der aktuellen Datei&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;voller Pfadname des Verzeichnisses&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;Dateiname der aktuellen Datei (ohne Verzeichnis)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;wie &lt;i&gt;file_name&lt;/i&gt;, aber ohne Erweiterung&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;die Erweiterung der aktuellen Datei&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;der aktuell ausgewählte Text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Setzt den Cursor an diese Stelle nachdem das Template eingefügt wurde.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Setzt die Auswahl nachdem das Template eingefügt wurde (verwendet zusammen mit „select_end“).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Setzt die Auswahl nachdem das Template eingefügt wurde (verwendet zusammen mit „select_start“).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;der Text der Zwischenablage&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Soll das einen Variablennamen umschließende Zeichen geändert werden, so kann dies im Konfigurationsdialog geschehen.&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -60048,6 +60075,21 @@
         <source>&lt;b&gt;Template name&lt;b&gt;&lt;p&gt;Enter the name of the template. Templates may be autocompleted upon this name. In order to support autocompletion. the template name must only consist of letters (a-z and A-Z), digits (0-9) and underscores (_).&lt;/p&gt;</source>
         <translation>&lt;b&gt;Vorlagenname&lt;/b&gt;&lt;p&gt;Gib den Namen der Vorlage ein. Vorlagen werden basierend auf ihrem Namen vervollständigt. Um dies zu unterstützen, darf der Name nur Buchstaben (a-z und A-Z), Ziffern (0-9) und Unterstriche (_) enthalten.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>Template Help</source>
+        <translation>Hilfe zu Vorlagen</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Hilfe zu Vorlagen&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;: and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Um Variablen in einer Vorlage zu verwenden, muss der Variablenname mit einem $-Zeichen umschlossen werden. Wenn die Vorlage angewandt wird, wird nach einem Wert für diese Variable gefragt.&lt;/p&gt;&lt;p&gt;Beispiel: Dies ist eine $Variable$&lt;/p&gt;&lt;p&gt;Wenn diese Vorlage angewandt wird, wird nach einem Wert für die Variable $Variable$ gefragt. Jedes Vorkommen von $Variable$ wird dann durch den eingegebenen Text ersetzt.&lt;/p&gt;&lt;p&gt;Wird in der Vorlage ein einzelnes $-Zeichen, das keine Variable umschließt, benötigt, so muss dies als $$ (zwei Dollar Zeichen) geschrieben werden. Bei der Anwendung der Vorlage wird dies automatisch zu einem $-Zeichen.&lt;/p&gt;&lt;p&gt;Soll der Wert einer Variablen speziell behandelt werden, so muss dem Variablennamen ein „:“ und eine Formatangabe folgen (z.B. $Variable:ml$). Die unterstützten Formatangaben sind:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Gibt ein mehrzeiliges Format an. Der ersten Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt. Allen anderen wird soviel Leerraum vorangestellt, wie die Zeile der Variablen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Gibt ein wiederholendes Format an. Jede Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Die folgenden vordefinierten Variablen können in einer Vorlage verwendet werden:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;das aktuelle Datum im ISO-Format (JJJJ-MM-TT)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;das aktuelle Jahr&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;der Name des Projektes (falls vorhanden)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;der Pfad des Projektes (falls vorhanden)/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;voller Pfadname der aktuellen Datei&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;voller Pfadname des Verzeichnisses&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;Dateiname der aktuellen Datei (ohne Verzeichnis)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;wie &lt;i&gt;file_name&lt;/i&gt;, aber ohne Erweiterung&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;die Erweiterung der aktuellen Datei&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;der aktuell ausgewählte Text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Setzt den Cursor an diese Stelle nachdem das Template eingefügt wurde.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Setzt die Auswahl nachdem das Template eingefügt wurde (verwendet zusammen mit „select_end“).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Setzt die Auswahl nachdem das Template eingefügt wurde (verwendet zusammen mit „select_start“).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;der Text der Zwischenablage&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Soll das einen Variablennamen umschließende Zeichen geändert werden, so kann dies im Konfigurationsdialog geschehen.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -70484,7 +70526,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3417"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/>
         <source>eric6 Web Browser</source>
         <translation>eric6 Web-Browser</translation>
     </message>
@@ -70561,7 +70603,7 @@
         <translation>&lt;b&gt;Neues Fenster&lt;/b&gt;&lt;p&gt;Dies öffnet ein neues Web-Browser Fenster im aktuellen Privatsphärenmodus.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>New Private Window</source>
         <translation>Neues Privates Fenster</translation>
     </message>
@@ -70587,7 +70629,7 @@
         <translation>&lt;b&gt;Neues Privates Fenster&lt;/b&gt;&lt;p&gt;Dies startet ein neues privates Web-Browser Fenster durch Starten einer neuen Web-Browser Instanz im Privatmodus.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
@@ -70719,7 +70761,7 @@
         <translation>&lt;b&gt;Lesezeichen exportieren&lt;/b&gt;&lt;p&gt;Exportiert die Lesezeichen in eine Datei.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2089"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -72068,97 +72110,97 @@
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1921"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1922"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2139"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2144"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1947"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1949"/>
         <source>Text Encoding</source>
         <translation>Zeichenkodierung</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1958"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1961"/>
         <source>H&amp;istory</source>
         <translation>&amp;Chronik</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1974"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1978"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Lesezeichen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1990"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1994"/>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2020"/>
         <source>Global User Agent</source>
         <translation>Globaler User Agent</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2169"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2174"/>
         <source>&amp;Tools</source>
         <translation>&amp;Werkzeuge</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2057"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2061"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2193"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2198"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2225"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2230"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2238"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2243"/>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2248"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2253"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2257"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2262"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2267"/>
         <source>Filtered by: </source>
         <translation>Filter: </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2275"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2282"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2287"/>
         <source>Tools</source>
         <translation>Werkzeuge</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2291"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2296"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2298"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2303"/>
         <source>VirusTotal</source>
         <translation>VirusTotal</translation>
     </message>
@@ -72168,114 +72210,114 @@
         <translation>Aktuelle Seite prüfen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>IP Address Report</source>
         <translation>IP Adressenbericht</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Domain Report</source>
         <translation>Domänenbericht</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>&lt;p&gt;Could not start the process.&lt;br&gt;Ensure that it is available as &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Prozess konnte nicht gestartet werden.&lt;br&gt;Stellen Sie sicher, dass er als &lt;b&gt;{0}&lt;/b&gt; verfügbar ist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2510"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2515"/>
         <source>&lt;b&gt;eric6 Web Browser - {0}&lt;/b&gt;&lt;p&gt;The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.&lt;/p&gt;&lt;p&gt;It is based on QtWebEngine {1} and Chrome {2}.&lt;/p&gt;</source>
         <translation>&lt;b&gt;eric6 Web-Browser – {0}&lt;/b&gt;&lt;p&gt;Der eric6 Web-Browser ist eine kombinierte Anzeige für Hilfe- und HTML-Dateien. Er ist Bestandteil der eric6-Entwicklungsumgebung.&lt;/p&gt;&lt;p&gt;Er basiert auf QtWebEngine {1} und Chrome {2}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2634"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2639"/>
         <source>Saved Tabs</source>
         <translation>Gesicherte Tabs</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3234"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3239"/>
         <source>Could not find an associated content.</source>
         <translation>Konnte keinen zugehörigen Inhalt finden.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3337"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3342"/>
         <source>Updating search index</source>
         <translation>Aktualisiere Suchindex</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3407"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3412"/>
         <source>Looking for Documentation...</source>
         <translation>Suche nach Dokumentation...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3442"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3447"/>
         <source>Unfiltered</source>
         <translation>Ungefiltert</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3461"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3466"/>
         <source>Help Engine</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4014"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4019"/>
         <source>ISO</source>
         <translation>ISO</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4018"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4023"/>
         <source>Windows</source>
         <translation>Windows</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4020"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4025"/>
         <source>ISCII</source>
         <translation>ISCII</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4021"/>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4024"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4029"/>
         <source>Other</source>
         <translation>Sonstige</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4022"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4027"/>
         <source>IBM</source>
         <translation>IBM</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>VirusTotal Scan</source>
         <translation>VirusTotal-Prüfung</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die VirusTotal-Prüfung konnte nicht beauftragt werden.&lt;p&gt;
 &lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4467"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4472"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation>Gib eine gültige IPv4 Adresse in Vierpunktnotation ein:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation>Die eingegebene IP Adresse ist nicht in Vierpunktnotation.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Enter a valid domain name:</source>
         <translation>Gib einen gültigen Domänennamen ein:</translation>
     </message>
@@ -72347,7 +72389,7 @@
         <translation>Alt+Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source>
         <translation>Hilfedateien (*.html *.htm *.mhtml *.mht);;PDF-Dateien (*.pdf);;CHM Dateien (*.chm);;Alle Dateien (*)</translation>
     </message>
@@ -72362,52 +72404,52 @@
         <translation>Meta+Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2175"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2180"/>
         <source>&amp;VirusTotal</source>
         <translation>&amp;VirusTotal</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2141"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2146"/>
         <source>&amp;Windows</source>
         <translation>&amp;Fenster</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2051"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2055"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Werkzeugleisten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2077"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2082"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2097"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2102"/>
         <source>Show All History...</source>
         <translation>Chronik anzeigen...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4049"/>
-        <source>Menu Bar</source>
-        <translation>Menüleiste</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4054"/>
-        <source>Bookmarks</source>
-        <translation>Lesezeichen</translation>
+        <source>Menu Bar</source>
+        <translation>Menüleiste</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4059"/>
+        <source>Bookmarks</source>
+        <translation>Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4064"/>
         <source>Status Bar</source>
         <translation>Statusleiste</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4073"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4078"/>
         <source>&amp;Show all</source>
         <translation>Alle an&amp;zeigen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4075"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4080"/>
         <source>&amp;Hide all</source>
         <translation>Alle &amp;ausblenden</translation>
     </message>
--- a/i18n/eric6_empty.ts	Sun Jun 25 16:17:00 2017 +0200
+++ b/i18n/eric6_empty.ts	Mon Jun 26 19:31:49 2017 +0200
@@ -13593,7 +13593,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13678,40 +13678,60 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Close dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Do you really want to close the dialog?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Mail Server Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Enter your mail server password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="322"/>
+        <location filename="../UI/EmailDialog.py" line="356"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.py" line="414"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="368"/>
+        <location filename="../UI/EmailDialog.py" line="429"/>
         <source>Attach file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="99"/>
+        <source>Google Mail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="171"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="177"/>
+        <source>Gmail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="414"/>
+        <source>Send Message</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailPage</name>
@@ -13721,135 +13741,160 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="71"/>
         <source>Outgoing mail server (SMTP):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="78"/>
         <source>Enter the address of your mail server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
-        <source>Enter the port of the mail server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
+        <source>Enter the port of the mail server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="188"/>
         <source>Email address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
-        <source>Enter your email address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
-        <source>Enter your email signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
-        <source>Select to use TLS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
-        <source>Select to authenticatate against the mail server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
+        <source>Enter your email address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="202"/>
+        <source>Signature:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="212"/>
+        <source>Enter your email signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="136"/>
+        <source>Select to use TLS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="224"/>
+        <source>Select to authenticatate against the mail server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="227"/>
         <source>Mail server needs authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="236"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="243"/>
         <source>Enter your mail server username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="250"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="257"/>
         <source>Enter your password for accessing the mail server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="267"/>
         <source>Press to test the login data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="270"/>
         <source>Test Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>Login Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="221"/>
         <source>The login test succeeded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="85"/>
         <source>Encryption Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="113"/>
         <source>Select to use no encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="126"/>
         <source>Select to use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="129"/>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="139"/>
         <source>TLS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="149"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="37"/>
+        <source>Google Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="43"/>
+        <source>Use Google Mail with OAuth2 authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="50"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="63"/>
+        <source>Standard Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="48"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -39859,27 +39904,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1563"/>
+        <location filename="../Preferences/__init__.py" line="1564"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59377,24 +59422,6 @@
     </message>
 </context>
 <context>
-    <name>TemplateHelpDialog</name>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
-        <source>Template Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
-        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.py" line="33"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -59503,6 +59530,21 @@
         <source>Do you really want to close the dialog?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>Template Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;: and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -69888,7 +69930,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3417"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -69965,7 +70007,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>New Private Window</source>
         <translation type="unfinished"></translation>
     </message>
@@ -69991,7 +70033,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -70149,7 +70191,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2089"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71534,97 +71576,97 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1921"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1922"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2139"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2144"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1947"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1949"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1958"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1961"/>
         <source>H&amp;istory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1974"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1978"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1990"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1994"/>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2020"/>
         <source>Global User Agent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2169"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2174"/>
         <source>&amp;Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2057"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2061"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2193"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2198"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2225"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2230"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2238"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2243"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2248"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2253"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2257"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2262"/>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2267"/>
         <source>Filtered by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2275"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2282"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2287"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2291"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2296"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2298"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2303"/>
         <source>VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71634,118 +71676,118 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>&lt;p&gt;Could not start the process.&lt;br&gt;Ensure that it is available as &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2510"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2515"/>
         <source>&lt;b&gt;eric6 Web Browser - {0}&lt;/b&gt;&lt;p&gt;The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.&lt;/p&gt;&lt;p&gt;It is based on QtWebEngine {1} and Chrome {2}.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2634"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2639"/>
         <source>Saved Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3234"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3239"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3337"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3342"/>
         <source>Updating search index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3407"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3412"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3442"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3447"/>
         <source>Unfiltered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3461"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3466"/>
         <source>Help Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4014"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4019"/>
         <source>ISO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4018"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4023"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4020"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4025"/>
         <source>ISCII</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4021"/>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4024"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4029"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4022"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4027"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4467"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4472"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71760,52 +71802,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2175"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2180"/>
         <source>&amp;VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2141"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2146"/>
         <source>&amp;Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2051"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2055"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2077"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2082"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2097"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2102"/>
         <source>Show All History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4049"/>
-        <source>Menu Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4054"/>
-        <source>Bookmarks</source>
+        <source>Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4059"/>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4064"/>
         <source>Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4073"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4078"/>
         <source>&amp;Show all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4075"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4080"/>
         <source>&amp;Hide all</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Sun Jun 25 16:17:00 2017 +0200
+++ b/i18n/eric6_en.ts	Mon Jun 26 19:31:49 2017 +0200
@@ -13607,7 +13607,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13692,40 +13692,60 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Close dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Do you really want to close the dialog?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Mail Server Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Enter your mail server password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="322"/>
+        <location filename="../UI/EmailDialog.py" line="356"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.py" line="414"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="368"/>
+        <location filename="../UI/EmailDialog.py" line="429"/>
         <source>Attach file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="99"/>
+        <source>Google Mail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="171"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="177"/>
+        <source>Gmail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="414"/>
+        <source>Send Message</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailPage</name>
@@ -13735,135 +13755,160 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="71"/>
         <source>Outgoing mail server (SMTP):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="78"/>
         <source>Enter the address of your mail server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
-        <source>Enter the port of the mail server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
+        <source>Enter the port of the mail server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="188"/>
         <source>Email address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
-        <source>Enter your email address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
-        <source>Enter your email signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
-        <source>Select to use TLS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
-        <source>Select to authenticatate against the mail server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
+        <source>Enter your email address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="202"/>
+        <source>Signature:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="212"/>
+        <source>Enter your email signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="136"/>
+        <source>Select to use TLS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="224"/>
+        <source>Select to authenticatate against the mail server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="227"/>
         <source>Mail server needs authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="236"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="243"/>
         <source>Enter your mail server username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="250"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="257"/>
         <source>Enter your password for accessing the mail server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="267"/>
         <source>Press to test the login data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="270"/>
         <source>Test Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>Login Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="221"/>
         <source>The login test succeeded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="85"/>
         <source>Encryption Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="113"/>
         <source>Select to use no encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="126"/>
         <source>Select to use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="129"/>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="139"/>
         <source>TLS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="149"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="37"/>
+        <source>Google Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="43"/>
+        <source>Use Google Mail with OAuth2 authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="50"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="63"/>
+        <source>Standard Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="48"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -39898,27 +39943,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1563"/>
+        <location filename="../Preferences/__init__.py" line="1564"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59419,24 +59464,6 @@
     </message>
 </context>
 <context>
-    <name>TemplateHelpDialog</name>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
-        <source>Template Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
-        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.py" line="33"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -59545,6 +59572,21 @@
         <source>Do you really want to close the dialog?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>Template Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;: and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -69928,7 +69970,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3417"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -70005,7 +70047,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>New Private Window</source>
         <translation type="unfinished"></translation>
     </message>
@@ -70031,7 +70073,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -70163,7 +70205,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2089"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71512,97 +71554,97 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1921"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1922"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2139"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2144"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1947"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1949"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1958"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1961"/>
         <source>H&amp;istory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1974"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1978"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1990"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1994"/>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2020"/>
         <source>Global User Agent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2169"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2174"/>
         <source>&amp;Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2057"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2061"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2193"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2198"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2225"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2230"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2238"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2243"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2248"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2253"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2257"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2262"/>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2267"/>
         <source>Filtered by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2275"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2282"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2287"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2291"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2296"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2298"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2303"/>
         <source>VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71612,113 +71654,113 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>&lt;p&gt;Could not start the process.&lt;br&gt;Ensure that it is available as &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2510"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2515"/>
         <source>&lt;b&gt;eric6 Web Browser - {0}&lt;/b&gt;&lt;p&gt;The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.&lt;/p&gt;&lt;p&gt;It is based on QtWebEngine {1} and Chrome {2}.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2634"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2639"/>
         <source>Saved Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3234"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3239"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3337"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3342"/>
         <source>Updating search index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3407"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3412"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3442"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3447"/>
         <source>Unfiltered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3461"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3466"/>
         <source>Help Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4014"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4019"/>
         <source>ISO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4018"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4023"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4020"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4025"/>
         <source>ISCII</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4021"/>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4024"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4029"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4022"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4027"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4467"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4472"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71790,7 +71832,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71805,52 +71847,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2175"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2180"/>
         <source>&amp;VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2141"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2146"/>
         <source>&amp;Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2051"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2055"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2077"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2082"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2097"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2102"/>
         <source>Show All History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4049"/>
-        <source>Menu Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4054"/>
-        <source>Bookmarks</source>
+        <source>Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4059"/>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4064"/>
         <source>Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4073"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4078"/>
         <source>&amp;Show all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4075"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4080"/>
         <source>&amp;Hide all</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Sun Jun 25 16:17:00 2017 +0200
+++ b/i18n/eric6_es.ts	Mon Jun 26 19:31:49 2017 +0200
@@ -13699,7 +13699,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation>Enviar informe de bugs</translation>
     </message>
@@ -13759,27 +13759,27 @@
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Close dialog</source>
         <translation>Cerrar diálogo</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Do you really want to close the dialog?</source>
         <translation>¿Realmente desea cerrar el diálogo?</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Mail Server Password</source>
         <translation>Contraseña para el servidor de correo</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Enter your mail server password</source>
         <translation>Introduzca su contraseña para el servidor de correo</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="368"/>
+        <location filename="../UI/EmailDialog.py" line="429"/>
         <source>Attach file</source>
         <translation>Insertar archivo</translation>
     </message>
@@ -13809,15 +13809,35 @@
         <translation>Enviar solicitud de característica</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="322"/>
+        <location filename="../UI/EmailDialog.py" line="356"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;La autenticación ha fallado.&lt;br/&gt; Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.py" line="414"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El mensaje no ha podido ser enviado.&lt;br/&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="99"/>
+        <source>Google Mail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="171"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="177"/>
+        <source>Gmail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="414"/>
+        <source>Send Message</source>
+        <translation type="unfinished">Enviar Mensaje</translation>
+    </message>
 </context>
 <context>
     <name>EmailPage</name>
@@ -13827,135 +13847,160 @@
         <translation>&lt;b&gt;Configurar Correo electrónico&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="257"/>
         <source>Enter your password for accessing the mail server</source>
         <translation>Introduzca su contraseña para acceder al servidor de correo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="243"/>
         <source>Enter your mail server username</source>
         <translation>Introduzca su nombre de usuario en el servidor de correo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="202"/>
         <source>Signature:</source>
         <translation>Firma:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="78"/>
         <source>Enter the address of your mail server</source>
         <translation>Introduzca la dirección de su servidor de correo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="188"/>
         <source>Email address:</source>
         <translation>Dirección de correo electrónico:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="212"/>
         <source>Enter your email signature</source>
         <translation>Introduzca su firma para los correos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
-        <source>Enter your email address</source>
-        <translation>Introduzca su dirección de correo electrónico</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
-        <source>Select to authenticatate against the mail server</source>
-        <translation>Seleccionar para autenticación contra el servidor de correo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
+        <source>Enter your email address</source>
+        <translation>Introduzca su dirección de correo electrónico</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="224"/>
+        <source>Select to authenticatate against the mail server</source>
+        <translation>Seleccionar para autenticación contra el servidor de correo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="227"/>
         <source>Mail server needs authentication</source>
         <translation>El servidor de correo necesita autenticación</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="236"/>
         <source>Username:</source>
         <translation>Nombre de Usuario:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="250"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="136"/>
         <source>Select to use TLS</source>
         <translation>Seleccionar para usar TLS</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
         <source>Enter the port of the mail server</source>
         <translation>Introduzca el puerto del servidor de correo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="71"/>
         <source>Outgoing mail server (SMTP):</source>
         <translation>Servidor de correo saliente (SMTP):</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="267"/>
         <source>Press to test the login data</source>
         <translation>Pulse para probar los datos de login</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="270"/>
         <source>Test Login</source>
         <translation>Probar Login</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>Login Test</source>
         <translation>Prueba de Login</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="221"/>
         <source>The login test succeeded.</source>
         <translation>La prueba de login ha resultado con éxito.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El login ha fallado.&lt;br/&gt; Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="85"/>
         <source>Encryption Method:</source>
         <translation>Método de Encriptación:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="113"/>
         <source>Select to use no encryption</source>
         <translation>Seleccionar para no utilizar encriptación</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="126"/>
         <source>Select to use SSL</source>
         <translation>Seleccionar para usar SSL</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="129"/>
         <source>SSL</source>
         <translation>SSL</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="139"/>
         <source>TLS</source>
         <translation>TLS</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="149"/>
         <source>Port:</source>
         <translation>Puerto:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="37"/>
+        <source>Google Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="43"/>
+        <source>Use Google Mail with OAuth2 authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="50"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="63"/>
+        <source>Standard Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="48"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -40057,27 +40102,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1563"/>
+        <location filename="../Preferences/__init__.py" line="1564"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
@@ -59866,17 +59911,17 @@
     <message>
         <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
         <source>Template Help</source>
-        <translation>Ayuda para la Plantilla</translation>
+        <translation type="obsolete">Ayuda para la Plantilla</translation>
     </message>
     <message>
         <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
         <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Ayuda para la Plantilla&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Ayuda para la Plantilla&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../Templates/TemplateHelpDialog.py" line="33"/>
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Para utilizar variables en una plantilla, solamente tiene que delimitar el nombre de variable con carácteres $. Al utilizar la plantilla, se le solicitará un valor para esta variable.&lt;/p&gt;&lt;p&gt;Ejemplo de plantilla: esto es una $VAR$&lt;/p&gt;&lt;p&gt;Al utilizar esta plantilla se le solicitará un valor para la variable $VAR$. Todas las ocurrencias de $VAR$ serán entonces reemplazadas con el valor introducido.&lt;/p&gt;&lt;p&gt;Si necesita utilizar el caracter $ en una plantilla que no vaya a ser utilizado para delimitar una variable, teclee $$ (dos carácteres dólar). Se reemplazarán automáticamente con un carácter $ único al utilizar la plantilla.&lt;/p&gt;&lt;p&gt;Si desea tratar específicamente los contenidos de alguna variable, el nombre de variable debe ser seguido por un &apos;:&apos; y un especificador de formato.(por ejemplo $VAR:ml$). Los especificadores soportados son:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;A la primera línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla. Al resto de las líneas se les antepone la misma cantidad de espacios en blanco que la línea que contiene la variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Especifica un formato de repetición de líneas. A cada línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Las siguientes variables predefinidas se pueden utilizar en una plantilla:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;fecha actual formato ISO (AAAA-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;el año actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;el nombre del proyecto (si existe)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;ruta completa del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;ruta completa del directorio padre&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nombre del archivo actual (sin directorio)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;como &lt;i&gt;file_name&lt;/i&gt;, pero sin extensión&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;la extensión del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;el texto seleccionado actualmente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Establece punto de inserción para el cursor despues de insertar la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;el texto del portapapeles&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Si desea cambiar el delimitador a otro distinto, por favor utilice el diálogo de configuración para hacerlo.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Para utilizar variables en una plantilla, solamente tiene que delimitar el nombre de variable con carácteres $. Al utilizar la plantilla, se le solicitará un valor para esta variable.&lt;/p&gt;&lt;p&gt;Ejemplo de plantilla: esto es una $VAR$&lt;/p&gt;&lt;p&gt;Al utilizar esta plantilla se le solicitará un valor para la variable $VAR$. Todas las ocurrencias de $VAR$ serán entonces reemplazadas con el valor introducido.&lt;/p&gt;&lt;p&gt;Si necesita utilizar el caracter $ en una plantilla que no vaya a ser utilizado para delimitar una variable, teclee $$ (dos carácteres dólar). Se reemplazarán automáticamente con un carácter $ único al utilizar la plantilla.&lt;/p&gt;&lt;p&gt;Si desea tratar específicamente los contenidos de alguna variable, el nombre de variable debe ser seguido por un &apos;:&apos; y un especificador de formato.(por ejemplo $VAR:ml$). Los especificadores soportados son:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;A la primera línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla. Al resto de las líneas se les antepone la misma cantidad de espacios en blanco que la línea que contiene la variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Especifica un formato de repetición de líneas. A cada línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Las siguientes variables predefinidas se pueden utilizar en una plantilla:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;fecha actual formato ISO (AAAA-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;el año actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;el nombre del proyecto (si existe)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;ruta completa del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;ruta completa del directorio padre&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nombre del archivo actual (sin directorio)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;como &lt;i&gt;file_name&lt;/i&gt;, pero sin extensión&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;la extensión del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;el texto seleccionado actualmente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Establece punto de inserción para el cursor despues de insertar la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;el texto del portapapeles&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Si desea cambiar el delimitador a otro distinto, por favor utilice el diálogo de configuración para hacerlo.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -59991,6 +60036,21 @@
         <source>&lt;b&gt;Template name&lt;b&gt;&lt;p&gt;Enter the name of the template. Templates may be autocompleted upon this name. In order to support autocompletion. the template name must only consist of letters (a-z and A-Z), digits (0-9) and underscores (_).&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nombre de plantilla&lt;/b&gt;&lt;p&gt;Introduzca el nombre de la plantilla. Las plantillas pueden ser autocompletadas en base a este nombre. Para dar soporte a autocompletar, el nombre de plantilla debe consistir solamente en letras (a-z y A-Z) y guiones bajos (_).&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>Template Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished">&lt;b&gt;Ayuda para la Plantilla&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;: and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -70424,7 +70484,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3417"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/>
         <source>eric6 Web Browser</source>
         <translation>Navegador Web de eric6</translation>
     </message>
@@ -70501,7 +70561,7 @@
         <translation>&lt;b&gt;Nueva Ventana&lt;/b&gt;&lt;p&gt;Abre una nueva ventana de navegador web en el modo de privacidad actual.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>New Private Window</source>
         <translation>Nueva Ventana Privada</translation>
     </message>
@@ -70527,7 +70587,7 @@
         <translation>&lt;b&gt;Nueva Ventana Privada&lt;/b&gt;&lt;p&gt;Abre una nueva ventana privada de navegador web iniciando una nueva instancia del navegador en web en modo privado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>Open File</source>
         <translation>Abrir archivo</translation>
     </message>
@@ -70659,7 +70719,7 @@
         <translation>&lt;b&gt;Exportar Marcadores&lt;/b&gt;&lt;p&gt;Exportar los marcadores a un archivo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2089"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -72008,97 +72068,97 @@
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1921"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1922"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2139"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2144"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1947"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1949"/>
         <source>Text Encoding</source>
         <translation>Codificación de Texto</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1958"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1961"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historial</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1974"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1978"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Marcadores</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1990"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1994"/>
         <source>&amp;Settings</source>
         <translation>Con&amp;figuración</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2020"/>
         <source>Global User Agent</source>
         <translation>Agente de Usuario Global</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2169"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2174"/>
         <source>&amp;Tools</source>
         <translation>&amp;Herramientas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2057"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2061"/>
         <source>&amp;Help</source>
         <translation>A&amp;yuda</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2193"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2198"/>
         <source>File</source>
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2225"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2230"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2238"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2243"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2248"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2253"/>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2257"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2262"/>
+        <source>Filter</source>
+        <translation>Filtro</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2267"/>
         <source>Filtered by: </source>
         <translation>Filtrado por:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2275"/>
         <source>Settings</source>
         <translation>Ajustes</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2282"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2287"/>
         <source>Tools</source>
         <translation>Herramientas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2291"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2296"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2298"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2303"/>
         <source>VirusTotal</source>
         <translation>VirusTotal</translation>
     </message>
@@ -72108,114 +72168,114 @@
         <translation>Analizar sitio actual</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>IP Address Report</source>
         <translation>Informe de Dirección IP</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Domain Report</source>
         <translation>Informe de Dominio</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>&lt;p&gt;Could not start the process.&lt;br&gt;Ensure that it is available as &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido ejecutar el proceso.&lt;br&gt;Asegúrese de que esta disponible como &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2510"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2515"/>
         <source>&lt;b&gt;eric6 Web Browser - {0}&lt;/b&gt;&lt;p&gt;The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.&lt;/p&gt;&lt;p&gt;It is based on QtWebEngine {1} and Chrome {2}.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Navegador Web de eric6- {0}&lt;/b&gt;&lt;p&gt;El Navegador Web de eric6 is una combinación de navegador de archivos de ayuda y de HTML. Es parte del conjunto de herramientas de desarrollo de eric6.&lt;/p&gt;&lt;p&gt;Está basado en QtWebEngine {1} y Chrome {2}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2634"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2639"/>
         <source>Saved Tabs</source>
         <translation>Pestañas Guardadas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3234"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3239"/>
         <source>Could not find an associated content.</source>
         <translation>No se ha podido encontrar un contenido asociado.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3337"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3342"/>
         <source>Updating search index</source>
         <translation>Actualizando índice de búsqueda</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3407"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3412"/>
         <source>Looking for Documentation...</source>
         <translation>Buscando Documentación...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3442"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3447"/>
         <source>Unfiltered</source>
         <translation>Sin filtrar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3461"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3466"/>
         <source>Help Engine</source>
         <translation>Motor de Ayuda</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4014"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4019"/>
         <source>ISO</source>
         <translation>ISO</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4018"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4023"/>
         <source>Windows</source>
         <translation>Windows</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4020"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4025"/>
         <source>ISCII</source>
         <translation>ISCII</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4021"/>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4024"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4029"/>
         <source>Other</source>
         <translation>Otro</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4022"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4027"/>
         <source>IBM</source>
         <translation>IBM</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>VirusTotal Scan</source>
         <translation>Análisis con VirusTotal</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El análisis con VirusTotal no se ha podido programar.&lt;p&gt;
 &lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4467"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4472"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation>Introducir una dirección IPv4 válida en notación decimal punteada:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation>La dirección IP no se ha proporcionado en notación decimal punteada.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Enter a valid domain name:</source>
         <translation>Introducir un nombre de dominio válido:</translation>
     </message>
@@ -72287,7 +72347,7 @@
         <translation>Alt+Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source>
         <translation>Archivos HTML (*.html *.htm *.mhtml *.mht);;Archivos PDF (*.pdf);;Archivos CHM (*.chm);;Todos los Archivos (*)</translation>
     </message>
@@ -72302,52 +72362,52 @@
         <translation>Meta+Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2175"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2180"/>
         <source>&amp;VirusTotal</source>
         <translation>&amp;VirusTotal</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2141"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2146"/>
         <source>&amp;Windows</source>
         <translation>&amp;Ventanas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2051"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2055"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Barra de Herramientas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2077"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2082"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2097"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2102"/>
         <source>Show All History...</source>
         <translation>Mostrar Todo el Historial...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4049"/>
-        <source>Menu Bar</source>
-        <translation>Barra de Menú</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4054"/>
-        <source>Bookmarks</source>
-        <translation>Marcadores</translation>
+        <source>Menu Bar</source>
+        <translation>Barra de Menú</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4059"/>
+        <source>Bookmarks</source>
+        <translation>Marcadores</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4064"/>
         <source>Status Bar</source>
         <translation>Barra de Estado</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4073"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4078"/>
         <source>&amp;Show all</source>
         <translation>Mo&amp;strar todo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4075"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4080"/>
         <source>&amp;Hide all</source>
         <translation>&amp;Ocultar todo</translation>
     </message>
--- a/i18n/eric6_fr.ts	Sun Jun 25 16:17:00 2017 +0200
+++ b/i18n/eric6_fr.ts	Mon Jun 26 19:31:49 2017 +0200
@@ -14057,22 +14057,22 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation>Envoyer un rapport de bug</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="368"/>
+        <location filename="../UI/EmailDialog.py" line="429"/>
         <source>Attach file</source>
         <translation>Pièce jointe</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Mail Server Password</source>
         <translation>Mot de masse du serveur mail</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Enter your mail server password</source>
         <translation>Entrer votre mot de passe pour le serveur mail</translation>
     </message>
@@ -14132,12 +14132,12 @@
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Close dialog</source>
         <translation>Fermer la fenêtre</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Voulez-vous réellement fermer cette fenêtre?</translation>
     </message>
@@ -14167,70 +14167,90 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="322"/>
+        <location filename="../UI/EmailDialog.py" line="356"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.py" line="414"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="99"/>
+        <source>Google Mail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="171"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="177"/>
+        <source>Gmail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="414"/>
+        <source>Send Message</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="257"/>
         <source>Enter your password for accessing the mail server</source>
         <translation>Entrer votre mot de passe pour accéder au serveur mail</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="243"/>
         <source>Enter your mail server username</source>
         <translation>Entrer votre nom d&apos;utilisateur pour le serveur mail</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="202"/>
         <source>Signature:</source>
         <translation>Signature:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="78"/>
         <source>Enter the address of your mail server</source>
         <translation>Entrer l&apos;adresse de votre serveur mail</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="188"/>
         <source>Email address:</source>
         <translation>Adresse Email:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="212"/>
         <source>Enter your email signature</source>
         <translation>Entrer votre signature mail</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
-        <source>Enter your email address</source>
-        <translation>Entrer votre adresse mail</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
-        <source>Select to authenticatate against the mail server</source>
-        <translation>Sélectionner pour s&apos;identifier auprès du serveur mail</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
+        <source>Enter your email address</source>
+        <translation>Entrer votre adresse mail</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="224"/>
+        <source>Select to authenticatate against the mail server</source>
+        <translation>Sélectionner pour s&apos;identifier auprès du serveur mail</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="227"/>
         <source>Mail server needs authentication</source>
         <translation>Le serveur mail a besoin d&apos;une identification</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="236"/>
         <source>Username:</source>
         <translation>Nom d&apos;utilisateur:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="250"/>
         <source>Password:</source>
         <translation>Mot de passe:</translation>
     </message>
@@ -14240,7 +14260,7 @@
         <translation>&lt;b&gt;Configuration de l&apos;email&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="136"/>
         <source>Select to use TLS</source>
         <translation>Cocher pour utiliser une connexion sécurisée TLS</translation>
     </message>
@@ -14250,75 +14270,100 @@
         <translation type="obsolete">Connexion TLS</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
         <source>Enter the port of the mail server</source>
         <translation>Entrer le port du serveur mail</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="71"/>
         <source>Outgoing mail server (SMTP):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="267"/>
         <source>Press to test the login data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="270"/>
         <source>Test Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>Login Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="221"/>
         <source>The login test succeeded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="85"/>
         <source>Encryption Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="113"/>
         <source>Select to use no encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="126"/>
         <source>Select to use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="129"/>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="139"/>
         <source>TLS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="149"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="37"/>
+        <source>Google Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="43"/>
+        <source>Use Google Mail with OAuth2 authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="50"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="63"/>
+        <source>Standard Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="48"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -40757,27 +40802,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1563"/>
+        <location filename="../Preferences/__init__.py" line="1564"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60892,17 +60937,7 @@
     <message>
         <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
         <source>Template Help</source>
-        <translation type="unfinished">Aide sur les gabarits</translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
-        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.py" line="33"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Aide sur les gabarits</translation>
     </message>
 </context>
 <context>
@@ -60941,9 +60976,9 @@
         <translation>GROUP</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
         <source>Template Help</source>
-        <translation type="obsolete">Aide sur les gabarits</translation>
+        <translation type="unfinished">Aide sur les gabarits</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="14"/>
@@ -61019,6 +61054,16 @@
         <source>&lt;b&gt;Template name&lt;b&gt;&lt;p&gt;Enter the name of the template. Templates may be autocompleted upon this name. In order to support autocompletion. the template name must only consist of letters (a-z and A-Z), digits (0-9) and underscores (_).&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nom de gabarit&lt;/b&gt;&lt;p&gt;Entrer le nom du gabarit. Les gabarits peuvent être auto-complétés à partir de ce nom. Pour supporter l&apos;autocomplétion, le nom de gabarit ne doit contenir que des lettres (a-z et A-Z), des chiffres (0-9) et des underscores (_).&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;: and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -71548,7 +71593,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3417"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71625,7 +71670,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>New Private Window</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71651,7 +71696,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>Open File</source>
         <translation type="unfinished">Ouvrir Fichier</translation>
     </message>
@@ -71783,7 +71828,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2089"/>
         <source>Print</source>
         <translation type="unfinished">Imprimer</translation>
     </message>
@@ -73138,17 +73183,17 @@
         <translation type="unfinished">&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1921"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1922"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edition</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2139"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2144"/>
         <source>&amp;View</source>
         <translation type="unfinished">&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1947"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1949"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73158,27 +73203,27 @@
         <translation type="obsolete">A&amp;ller</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1958"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1961"/>
         <source>H&amp;istory</source>
         <translation type="unfinished">&amp;Historique</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1974"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1978"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished">&amp;Signets</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1990"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1994"/>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2020"/>
         <source>Global User Agent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2169"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2174"/>
         <source>&amp;Tools</source>
         <translation type="unfinished">&amp;Outils</translation>
     </message>
@@ -73188,52 +73233,52 @@
         <translation type="obsolete">&amp;Fenêtre</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2057"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2061"/>
         <source>&amp;Help</source>
         <translation type="unfinished">A&amp;ide</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2193"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2198"/>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2225"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2230"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2238"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2243"/>
         <source>View</source>
         <translation type="unfinished">Affichage</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2248"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2253"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2257"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2262"/>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2267"/>
         <source>Filtered by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2275"/>
         <source>Settings</source>
         <translation type="unfinished">Configuration</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2282"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2287"/>
         <source>Tools</source>
         <translation type="unfinished">Outils</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2291"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2296"/>
         <source>Help</source>
         <translation type="unfinished">Aide</translation>
     </message>
@@ -73243,7 +73288,7 @@
         <translation type="obsolete">Aller à</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2298"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2303"/>
         <source>VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73253,22 +73298,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>&lt;p&gt;Could not start the process.&lt;br&gt;Ensure that it is available as &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -73278,93 +73323,93 @@
         <translation type="obsolete">Fichiers d&apos;aide (*.html *.htm);;Fichiers PDF (*.pdf);;Fichiers CHM (*.chm);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2510"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2515"/>
         <source>&lt;b&gt;eric6 Web Browser - {0}&lt;/b&gt;&lt;p&gt;The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.&lt;/p&gt;&lt;p&gt;It is based on QtWebEngine {1} and Chrome {2}.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2634"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2639"/>
         <source>Saved Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3234"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3239"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3337"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3342"/>
         <source>Updating search index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3407"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3412"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3442"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3447"/>
         <source>Unfiltered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3461"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3466"/>
         <source>Help Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4014"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4019"/>
         <source>ISO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4018"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4023"/>
         <source>Windows</source>
         <translation type="unfinished">Windows</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4020"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4025"/>
         <source>ISCII</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4021"/>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4024"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4029"/>
         <source>Other</source>
         <translation type="unfinished">Autre</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4022"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4027"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4467"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4472"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73436,7 +73481,7 @@
         <translation type="unfinished">Alt+Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73451,52 +73496,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2175"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2180"/>
         <source>&amp;VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2141"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2146"/>
         <source>&amp;Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2051"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2055"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished">&amp;Barres d&apos;Outils</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2077"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2082"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2097"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2102"/>
         <source>Show All History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4049"/>
-        <source>Menu Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4054"/>
-        <source>Bookmarks</source>
-        <translation type="unfinished">Signets</translation>
+        <source>Menu Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4059"/>
+        <source>Bookmarks</source>
+        <translation type="unfinished">Signets</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4064"/>
         <source>Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4073"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4078"/>
         <source>&amp;Show all</source>
         <translation type="unfinished">Tout &amp;afficher</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4075"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4080"/>
         <source>&amp;Hide all</source>
         <translation type="unfinished">Tout &amp;masquer</translation>
     </message>
--- a/i18n/eric6_it.ts	Sun Jun 25 16:17:00 2017 +0200
+++ b/i18n/eric6_it.ts	Mon Jun 26 19:31:49 2017 +0200
@@ -14182,22 +14182,22 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation>Invia un bug report</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="368"/>
+        <location filename="../UI/EmailDialog.py" line="429"/>
         <source>Attach file</source>
         <translation>Allega file</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Mail Server Password</source>
         <translation>Password del server di posta</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Enter your mail server password</source>
         <translation>Inserisci la tua password per il server di posta</translation>
     </message>
@@ -14257,12 +14257,12 @@
         <translation>Spedisci</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Close dialog</source>
         <translation>Chiudi dialogo</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Vuoi veramente chiudere questo dialogo ?</translation>
     </message>
@@ -14292,70 +14292,90 @@
         <translation>Invia una richiesta di funzionalità</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="322"/>
+        <location filename="../UI/EmailDialog.py" line="356"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Autenticazione fallita.&lt;br&gt;Motivo: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.py" line="414"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il messaggio non può essere inviato.&lt;br&gt;Motivo: {0}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="99"/>
+        <source>Google Mail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="171"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="177"/>
+        <source>Gmail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="414"/>
+        <source>Send Message</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailPage</name>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="257"/>
         <source>Enter your password for accessing the mail server</source>
         <translation>Inserisci la tua password per accedere al server di posta</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="243"/>
         <source>Enter your mail server username</source>
         <translation>Inserisci il nome utente utilizzato sul server di posta</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="202"/>
         <source>Signature:</source>
         <translation>Firma:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="78"/>
         <source>Enter the address of your mail server</source>
         <translation>Inserisci l&apos;indirizzo del tuo server di posta</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="188"/>
         <source>Email address:</source>
         <translation>Indirizzo Email:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="212"/>
         <source>Enter your email signature</source>
         <translation>Inserisci la tua firma per le mail</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
-        <source>Enter your email address</source>
-        <translation>Inserisci il tuo indirizzo di posta</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
-        <source>Select to authenticatate against the mail server</source>
-        <translation>Seleziona per autenticarti sul serverdi posta</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
+        <source>Enter your email address</source>
+        <translation>Inserisci il tuo indirizzo di posta</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="224"/>
+        <source>Select to authenticatate against the mail server</source>
+        <translation>Seleziona per autenticarti sul serverdi posta</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="227"/>
         <source>Mail server needs authentication</source>
         <translation>Il server di posta richiede l&apos;autenticazione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="236"/>
         <source>Username:</source>
         <translation>Nome Utente:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="250"/>
         <source>Password:</source>
         <translation>Passoword:</translation>
     </message>
@@ -14365,7 +14385,7 @@
         <translation>&lt;b&gt;Configura Email&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="136"/>
         <source>Select to use TLS</source>
         <translation>Seleziona per usare TLS</translation>
     </message>
@@ -14375,12 +14395,12 @@
         <translation type="obsolete">Usa TLS</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
         <source>Enter the port of the mail server</source>
         <translation>Inserisci la porta del server di posta</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="71"/>
         <source>Outgoing mail server (SMTP):</source>
         <translation>Server di posta in uscita (SMTP):</translation>
     </message>
@@ -14390,65 +14410,90 @@
         <translation type="obsolete">Porta server di posta in uscita:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="267"/>
         <source>Press to test the login data</source>
         <translation>Premi per testare i dati di accesso</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="270"/>
         <source>Test Login</source>
         <translation>Testa l&apos;accesso</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>Login Test</source>
         <translation>Controllo accesso</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="221"/>
         <source>The login test succeeded.</source>
         <translation>Il controllo d&apos;accesso è corretto.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il controllo accesso è fallito.&lt;br&gt;Motivo: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="85"/>
         <source>Encryption Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="113"/>
         <source>Select to use no encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
         <source>None</source>
         <translation type="unfinished">Nessuno</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="126"/>
         <source>Select to use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="129"/>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="139"/>
         <source>TLS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="149"/>
         <source>Port:</source>
         <translation type="unfinished">Porta:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="37"/>
+        <source>Google Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="43"/>
+        <source>Use Google Mail with OAuth2 authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="50"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="63"/>
+        <source>Standard Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="48"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -41216,27 +41261,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1563"/>
+        <location filename="../Preferences/__init__.py" line="1564"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61417,19 +61462,9 @@
 <context>
     <name>TemplateHelpDialog</name>
     <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
-        <source>Template Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
-        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Templates/TemplateHelpDialog.py" line="33"/>
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Per usare una variabile in un template, devi solo racchiuderla con il carattare $. Quando usi il template, ti verrà chiesto il valora di questa variable.&lt;/p&gt;&lt;p&gt;Esempio di template: This is a $VAR$&lt;/p&gt;&lt;p&gt;Quando usi questo template, ti verrà chiesto il valore della variabile $VAR$. Ogni ricorrenza di $VAR$ verrà quindi sostituita con quello che hai inserito.&lt;/p&gt;&lt;p&gt;Se hai bisogno di un singolo $-character in un template, che non è usato per racchiudere una variabile, scrivi $$(due caratteri dollaro). Verranno automaticamente sostituiti con un singoleo $-character quando usi il template.&lt;/p&gt;&lt;p&gt;Se vuoi trattare in maniera specifica il contenuto di una variabile, il nome della variabile deve essere seguito da &apos;:&apos;  ed un indentificato di formato (e.g. $VAR:ml$). Gli indicatori supportati sono:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifica una formattazione multilinea. La prima linea del contenuto della variabile è preceduto da una stringa che ricorre prima della variabile sulla stessa riga del template. Tutte le altre linee sono precedute dallo stesso numero di spazi della linea che contiene la variabile.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifica una formattazione ripetuta. Ogni linea del contenuto della variabile è preceduto da una stringa trovata prima della variabile sulla linea del template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Le seguenti variabili predefinite possono essere utilizzate:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Data odierna in formato ISO (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;anno corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;Nome del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;percorso del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;percorso completo del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;percorso completo della directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nome del file corrente (senza directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;come &lt;i&gt;file_name&lt;/i&gt;, ma senza estensione&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;l&apos;estensione del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;il testo correntemente selezionato &lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Selezione il punto d&apos;inserimento del cursore dopo che il template è inserito.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;il testo nella clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Se vuoi modificare il delimitatore di default, usa il dialogo di configurazione.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Per usare una variabile in un template, devi solo racchiuderla con il carattare $. Quando usi il template, ti verrà chiesto il valora di questa variable.&lt;/p&gt;&lt;p&gt;Esempio di template: This is a $VAR$&lt;/p&gt;&lt;p&gt;Quando usi questo template, ti verrà chiesto il valore della variabile $VAR$. Ogni ricorrenza di $VAR$ verrà quindi sostituita con quello che hai inserito.&lt;/p&gt;&lt;p&gt;Se hai bisogno di un singolo $-character in un template, che non è usato per racchiudere una variabile, scrivi $$(due caratteri dollaro). Verranno automaticamente sostituiti con un singoleo $-character quando usi il template.&lt;/p&gt;&lt;p&gt;Se vuoi trattare in maniera specifica il contenuto di una variabile, il nome della variabile deve essere seguito da &apos;:&apos;  ed un indentificato di formato (e.g. $VAR:ml$). Gli indicatori supportati sono:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifica una formattazione multilinea. La prima linea del contenuto della variabile è preceduto da una stringa che ricorre prima della variabile sulla stessa riga del template. Tutte le altre linee sono precedute dallo stesso numero di spazi della linea che contiene la variabile.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifica una formattazione ripetuta. Ogni linea del contenuto della variabile è preceduto da una stringa trovata prima della variabile sulla linea del template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Le seguenti variabili predefinite possono essere utilizzate:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Data odierna in formato ISO (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;anno corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;Nome del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;percorso del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;percorso completo del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;percorso completo della directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nome del file corrente (senza directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;come &lt;i&gt;file_name&lt;/i&gt;, ma senza estensione&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;l&apos;estensione del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;il testo correntemente selezionato &lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Selezione il punto d&apos;inserimento del cursore dopo che il template è inserito.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;il testo nella clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Se vuoi modificare il delimitatore di default, usa il dialogo di configurazione.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -61468,9 +61503,9 @@
         <translation>GRUPPO</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
         <source>Template Help</source>
-        <translation type="obsolete">Aiuto template</translation>
+        <translation type="unfinished">Aiuto template</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="14"/>
@@ -61555,6 +61590,16 @@
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Per usare una variabile in un template, devi solo racchiuderla con il carattare $. Quando usi il template, ti verrà chiesto il valora di questa variable.&lt;/p&gt;&lt;p&gt;Esempio di template: This is a $VAR$&lt;/p&gt;&lt;p&gt;Quando usi questo template, ti verrà chiesto il valore della variabile $VAR$. Ogni ricorrenza di $VAR$ verrà quindi sostituita con quello che hai inserito.&lt;/p&gt;&lt;p&gt;Se hai bisogno di un singolo $-character in un template, che non è usato per racchiudere una variabile, scrivi $$(due caratteri dollaro). Verranno automaticamente sostituiti con un singoleo $-character quando usi il template.&lt;/p&gt;&lt;p&gt;Se vuoi trattare in maniera specifica il contenuto di una variabile, il nome della variabile deve essere seguito da &apos;:&apos;  ed un indentificato di formato (e.g. $VAR:ml$). Gli indicatori supportati sono:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifica una formattazione multilinea. La prima linea del contenuto della variabile è preceduto da una stringa che ricorre prima della variabile sulla stessa riga del template. Tutte le altre linee sono precedute dallo stesso numero di spazi della linea che contiene la variabile.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifica una formattazione ripetuta. Ogni linea del contenuto della variabile è preceduto da una stringa trovata prima della variabile sulla linea del template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Le seguenti variabili predefinite possono essere utilizzate:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Data odierna in formato ISO (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;anno corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;Nome del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;percorso del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;percorso completo del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;percorso completo della directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nome del file corrente (senza directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;come &lt;i&gt;file_name&lt;/i&gt;, ma senza estensione&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;l&apos;estensione del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;il testo correntemente selezionato &lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Selezione il punto d&apos;inserimento del cursore dopo che il template è inserito.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;il testo nella clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Se vuoi modificare il delimitatore di default, usa il dialogo di configurazione.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;: and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -72123,7 +72168,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3417"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72200,7 +72245,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>New Private Window</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72226,7 +72271,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>Open File</source>
         <translation type="unfinished">Apri File</translation>
     </message>
@@ -72358,7 +72403,7 @@
         <translation type="unfinished">&lt;b&gt;Esporta segnalibri&lt;/b&gt;&lt;p&gt;Esporta segnalibri in un file.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2089"/>
         <source>Print</source>
         <translation type="unfinished">Stampa</translation>
     </message>
@@ -73717,17 +73762,17 @@
         <translation type="unfinished">&amp;File</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1921"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1922"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edita</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2139"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2144"/>
         <source>&amp;View</source>
         <translation type="unfinished">&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1947"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1949"/>
         <source>Text Encoding</source>
         <translation type="unfinished">Codifica testo</translation>
     </message>
@@ -73737,77 +73782,77 @@
         <translation type="obsolete">&amp;Vai</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1958"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1961"/>
         <source>H&amp;istory</source>
         <translation type="unfinished">Cronolog&amp;ia</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1974"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1978"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished">Segnali&amp;bri</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1990"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1994"/>
         <source>&amp;Settings</source>
         <translation type="unfinished">Impo&amp;stazioni</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2020"/>
         <source>Global User Agent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2169"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2174"/>
         <source>&amp;Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2057"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2061"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2193"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2198"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2225"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2230"/>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2238"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2243"/>
         <source>View</source>
         <translation type="unfinished">Visualizza</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2248"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2253"/>
         <source>Find</source>
         <translation type="unfinished">Trova</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2257"/>
-        <source>Filter</source>
-        <translation type="unfinished">Filtro</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="2262"/>
+        <source>Filter</source>
+        <translation type="unfinished">Filtro</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2267"/>
         <source>Filtered by: </source>
         <translation type="unfinished">Filtrato per:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2275"/>
         <source>Settings</source>
         <translation type="unfinished">Impostazioni</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2282"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2287"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2291"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2296"/>
         <source>Help</source>
         <translation type="unfinished">Aiuto</translation>
     </message>
@@ -73817,7 +73862,7 @@
         <translation type="obsolete">Vai</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2298"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2303"/>
         <source>VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73827,22 +73872,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>&lt;p&gt;Could not start the process.&lt;br&gt;Ensure that it is available as &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Non posso avviare il processo.&lt;br&gt;Assicurarsi sia disponibile come &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -73852,67 +73897,67 @@
         <translation type="obsolete">File di help  (*.html *.htm);;File PDF (*.pdf);;File CHM (*.chm);;Tutti i file (*)</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2510"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2515"/>
         <source>&lt;b&gt;eric6 Web Browser - {0}&lt;/b&gt;&lt;p&gt;The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.&lt;/p&gt;&lt;p&gt;It is based on QtWebEngine {1} and Chrome {2}.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2634"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2639"/>
         <source>Saved Tabs</source>
         <translation type="unfinished">Salva Linguette</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3234"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3239"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished">Non posso trovare un contenuto associato.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3337"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3342"/>
         <source>Updating search index</source>
         <translation type="unfinished">Aggiornamento indice di ricerca</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3407"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3412"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished">Ricerca documentazione...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3442"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3447"/>
         <source>Unfiltered</source>
         <translation type="unfinished">Non filtrato</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3461"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3466"/>
         <source>Help Engine</source>
         <translation type="unfinished">Motore di help</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4014"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4019"/>
         <source>ISO</source>
         <translation type="unfinished">ISO</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4018"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4023"/>
         <source>Windows</source>
         <translation type="unfinished">Windows</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4020"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4025"/>
         <source>ISCII</source>
         <translation type="unfinished">ISCII</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4021"/>
         <source>Unicode</source>
         <translation type="unfinished">Unicode</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4024"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4029"/>
         <source>Other</source>
         <translation type="unfinished">Altro</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4022"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4027"/>
         <source>IBM</source>
         <translation type="unfinished">IBM</translation>
     </message>
@@ -73922,28 +73967,28 @@
         <translation type="obsolete">Encoding di default</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4441"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4446"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4467"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4472"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4476"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4481"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4486"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4491"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74015,7 +74060,7 @@
         <translation type="unfinished">Alt+Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74030,52 +74075,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2175"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2180"/>
         <source>&amp;VirusTotal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2141"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2146"/>
         <source>&amp;Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2051"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2055"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished">&amp;Toolbar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2077"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2082"/>
         <source>Save</source>
         <translation type="unfinished">Salva</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2097"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2102"/>
         <source>Show All History...</source>
         <translation type="unfinished">Mostra tutta la cronologia...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4049"/>
-        <source>Menu Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4054"/>
-        <source>Bookmarks</source>
-        <translation type="unfinished">Segnalibri</translation>
+        <source>Menu Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="4059"/>
+        <source>Bookmarks</source>
+        <translation type="unfinished">Segnalibri</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4064"/>
         <source>Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4073"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4078"/>
         <source>&amp;Show all</source>
         <translation type="unfinished">Mo&amp;stra tutti</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4075"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4080"/>
         <source>&amp;Hide all</source>
         <translation type="unfinished">Nascondi &amp;tutti</translation>
     </message>
--- a/i18n/eric6_pt.ts	Sun Jun 25 16:17:00 2017 +0200
+++ b/i18n/eric6_pt.ts	Mon Jun 26 19:31:49 2017 +0200
@@ -14160,7 +14160,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation>Enviar relatório de falho</translation>
     </message>
@@ -14245,40 +14245,60 @@
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Close dialog</source>
         <translation>Caixa de diálogo de fecho</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="147"/>
+        <location filename="../UI/EmailDialog.py" line="154"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Tem a certeza de que quer fechar a caixa de diálogo?</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Mail Server Password</source>
         <translation>Senha do Servidor de Correio</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="302"/>
+        <location filename="../UI/EmailDialog.py" line="336"/>
         <source>Enter your mail server password</source>
         <translation>Introduzir a senha do seu servidor de correio</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="322"/>
+        <location filename="../UI/EmailDialog.py" line="356"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Falho na autenticação. &lt;br&gt;Razão: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="350"/>
+        <location filename="../UI/EmailDialog.py" line="414"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Não se pôde enviar a mensagem. &lt;br&gt;Razão: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="368"/>
+        <location filename="../UI/EmailDialog.py" line="429"/>
         <source>Attach file</source>
         <translation>Anexar ficheiro</translation>
     </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="99"/>
+        <source>Google Mail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="171"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="177"/>
+        <source>Gmail API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../UI/EmailDialog.py" line="414"/>
+        <source>Send Message</source>
+        <translation type="unfinished">Enviar Mensagem</translation>
+    </message>
 </context>
 <context>
     <name>EmailPage</name>
@@ -14288,12 +14308,12 @@
         <translation>&lt;b&gt;Configurar Correio Eletrónico&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="71"/>
         <source>Outgoing mail server (SMTP):</source>
         <translation>Servidor de correio de saída (SMTP):</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="78"/>
         <source>Enter the address of your mail server</source>
         <translation>Introduza a direção do seu servidor de correio</translation>
     </message>
@@ -14303,32 +14323,32 @@
         <translation type="obsolete">Porto do servidor de correio de saída:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
         <source>Enter the port of the mail server</source>
         <translation>Introduza o porto do servidor de correio</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="188"/>
         <source>Email address:</source>
         <translation>Direção do correio eletrónico:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
         <source>Enter your email address</source>
         <translation>Introduzir o direção do seu correio eletrónico</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="202"/>
         <source>Signature:</source>
         <translation>Assinatura:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="212"/>
         <source>Enter your email signature</source>
         <translation>Introduzir a assinatura do seu correio eletrónico</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="136"/>
         <source>Select to use TLS</source>
         <translation>Selecionar para usar TLS</translation>
     </message>
@@ -14338,95 +14358,120 @@
         <translation type="obsolete">Usar TLS</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="224"/>
         <source>Select to authenticatate against the mail server</source>
         <translation>Selecionar para autenticar contra o servidor de correio</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="227"/>
         <source>Mail server needs authentication</source>
         <translation>Servidor de correio necessita autenticação</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="236"/>
         <source>Username:</source>
         <translation>Nome de Usuário:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="243"/>
         <source>Enter your mail server username</source>
         <translation>Introduzir nome de usuário no seu servidor de correio</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="250"/>
         <source>Password:</source>
         <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="257"/>
         <source>Enter your password for accessing the mail server</source>
         <translation>Introduzir a sua senha para aceder ao servidor de correio</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="267"/>
         <source>Press to test the login data</source>
         <translation>Pressionar para provar os dados de conexão</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="270"/>
         <source>Test Login</source>
         <translation>Provar Conexão</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>Login Test</source>
         <translation>Prova de Conexão</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="221"/>
         <source>The login test succeeded.</source>
         <translation>A prova de conexão teve êxito.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="258"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;A prova de conexão falhou.&lt;br&gt;Motivo: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="85"/>
         <source>Encryption Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="113"/>
         <source>Select to use no encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="126"/>
         <source>Select to use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="129"/>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="139"/>
         <source>TLS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="149"/>
         <source>Port:</source>
         <translation type="unfinished">Porto:</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="37"/>
+        <source>Google Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="43"/>
+        <source>Use Google Mail with OAuth2 authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="50"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Google Mail using SMTP should be configured below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="63"/>
+        <source>Standard Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="48"/>
+        <source>&lt;p&gt;The Google Mail Client API is not installed. Use &lt;code&gt;pip install --upgrade google-api-python-client&lt;/code&gt; to install it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -41351,27 +41396,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1563"/>
+        <location filename="../Preferences/__init__.py" line="1564"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1591"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Selecionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1693"/>
+        <location filename="../Preferences/__init__.py" line="1694"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Selecionar o intérprete de Python{0} a usar:</translation>
     </message>
@@ -61193,17 +61238,7 @@
     <message>
         <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
         <source>Template Help</source>
-        <translation type="unfinished">Ajuda de Modelo</translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
-        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplateHelpDialog.py" line="33"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ajuda de Modelo</translation>
     </message>
 </context>
 <context>
@@ -61316,9 +61351,19 @@
         <translation>Tem a certeza de que quer fechar a caixa de diálogo?</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
         <source>Template Help</source>
-        <translation type="obsolete">Ajuda de Modelo</translation>
+        <translation type="unfinished">Ajuda de Modelo</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;: and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -71851,7 +71896,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3417"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished">Navegador Web de eric6</translation>
     </message>
@@ -71928,7 +71973,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2426"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2431"/>
         <source>New Private Window</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71954,7 +71999,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2459"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2464"/>
         <source>Open File</source>
         <translation type="unfinished">Abrir Ficheiro</translation>
     </message>
@@ -72086,7 +72131,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2089"/>
         <source>Print</source>
         <translation type="unfinished">Imprimir</translation>
     </message>
@@ -73440,17 +73485,17 @@
         <translation type="unfinished">&amp;Ficheiro</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="1921"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="1922"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>