eric: changeset 7281:8087ef6df2e4

--- a/docs/changelog	Sat Sep 28 19:03:56 2019 +0200
+++ b/docs/changelog	Sun Sep 29 17:03:39 2019 +0200
@@ -11,6 +11,7 @@
 - Editor
   -- added configuration option to set the tab and indentation width for each
      languages separately (as an override to the global ones)
+  -- added a typing aid for YAML
 - QFileDialog Wizard:
   -- added support for the QFileDialog.get...Url() methods
   -- added support for E5FileDialog
--- a/eric6.e4p	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6.e4p	Sun Sep 29 17:03:39 2019 +0200
@@ -843,6 +843,7 @@
     <Source>eric6/QScintilla/TypingCompleters/CompleterBase.py</Source>
     <Source>eric6/QScintilla/TypingCompleters/CompleterPython.py</Source>
     <Source>eric6/QScintilla/TypingCompleters/CompleterRuby.py</Source>
+    <Source>eric6/QScintilla/TypingCompleters/CompleterYaml.py</Source>
     <Source>eric6/QScintilla/TypingCompleters/__init__.py</Source>
     <Source>eric6/QScintilla/ZoomDialog.py</Source>
     <Source>eric6/QScintilla/__init__.py</Source>
--- a/eric6/APIs/Python3/eric6.api	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/APIs/Python3/eric6.api	Sun Sep 29 17:03:39 2019 +0200
@@ -8208,6 +8208,9 @@
 eric6.QScintilla.TypingCompleters.CompleterRuby.CompleterRuby.charAdded?4(charNumber)
 eric6.QScintilla.TypingCompleters.CompleterRuby.CompleterRuby.readSettings?4()
 eric6.QScintilla.TypingCompleters.CompleterRuby.CompleterRuby?1(editor, parent=None)
+eric6.QScintilla.TypingCompleters.CompleterYaml.CompleterYaml.charAdded?4(charNumber)
+eric6.QScintilla.TypingCompleters.CompleterYaml.CompleterYaml.readSettings?4()
+eric6.QScintilla.TypingCompleters.CompleterYaml.CompleterYaml?1(editor, parent=None)
 eric6.QScintilla.TypingCompleters.getCompleter?4(language, editor, parent=None)
 eric6.QScintilla.ZoomDialog.ZoomDialog.getZoomSize?4()
 eric6.QScintilla.ZoomDialog.ZoomDialog?1(zoom, parent, name=None, modal=False)
--- a/eric6/APIs/Python3/eric6.bas	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/APIs/Python3/eric6.bas	Sun Sep 29 17:03:39 2019 +0200
@@ -93,6 +93,7 @@
 CompleterBase QObject
 CompleterPython CompleterBase
 CompleterRuby CompleterBase
+CompleterYaml CompleterBase
 Conda QObject
 CondaExecDialog QDialog Ui_CondaExecDialog
 CondaExportDialog QDialog Ui_CondaExportDialog
Binary file eric6/Documentation/Help/source.qch has changed
--- a/eric6/Documentation/Help/source.qhp	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/Documentation/Help/source.qhp	Sun Sep 29 17:03:39 2019 +0200
@@ -870,6 +870,7 @@
               <section title="eric6.QScintilla.TypingCompleters.CompleterBase" ref="eric6.QScintilla.TypingCompleters.CompleterBase.html" />
               <section title="eric6.QScintilla.TypingCompleters.CompleterPython" ref="eric6.QScintilla.TypingCompleters.CompleterPython.html" />
               <section title="eric6.QScintilla.TypingCompleters.CompleterRuby" ref="eric6.QScintilla.TypingCompleters.CompleterRuby.html" />
+              <section title="eric6.QScintilla.TypingCompleters.CompleterYaml" ref="eric6.QScintilla.TypingCompleters.CompleterYaml.html" />
               <section title="eric6.QScintilla.TypingCompleters.__init__" ref="eric6.QScintilla.TypingCompleters.__init__.html" />
             </section>
             <section title="eric6.QScintilla.APIsManager" ref="eric6.QScintilla.APIsManager.html" />
@@ -2697,6 +2698,12 @@
       <keyword name="CompleterRuby.__inSingleQuotedString" id="CompleterRuby.__inSingleQuotedString" ref="eric6.QScintilla.TypingCompleters.CompleterRuby.html#CompleterRuby.__inSingleQuotedString" />
       <keyword name="CompleterRuby.charAdded" id="CompleterRuby.charAdded" ref="eric6.QScintilla.TypingCompleters.CompleterRuby.html#CompleterRuby.charAdded" />
       <keyword name="CompleterRuby.readSettings" id="CompleterRuby.readSettings" ref="eric6.QScintilla.TypingCompleters.CompleterRuby.html#CompleterRuby.readSettings" />
+      <keyword name="CompleterYaml" id="CompleterYaml" ref="eric6.QScintilla.TypingCompleters.CompleterYaml.html#CompleterYaml" />
+      <keyword name="CompleterYaml (Constructor)" id="CompleterYaml (Constructor)" ref="eric6.QScintilla.TypingCompleters.CompleterYaml.html#CompleterYaml.__init__" />
+      <keyword name="CompleterYaml (Module)" id="CompleterYaml (Module)" ref="eric6.QScintilla.TypingCompleters.CompleterYaml.html" />
+      <keyword name="CompleterYaml.__inComment" id="CompleterYaml.__inComment" ref="eric6.QScintilla.TypingCompleters.CompleterYaml.html#CompleterYaml.__inComment" />
+      <keyword name="CompleterYaml.charAdded" id="CompleterYaml.charAdded" ref="eric6.QScintilla.TypingCompleters.CompleterYaml.html#CompleterYaml.charAdded" />
+      <keyword name="CompleterYaml.readSettings" id="CompleterYaml.readSettings" ref="eric6.QScintilla.TypingCompleters.CompleterYaml.html#CompleterYaml.readSettings" />
       <keyword name="ComplexityChecker" id="ComplexityChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker" />
       <keyword name="ComplexityChecker (Constructor)" id="ComplexityChecker (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker.__init__" />
       <keyword name="ComplexityChecker (Module)" id="ComplexityChecker (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html" />
@@ -18476,6 +18483,7 @@
       <file>eric6.QScintilla.TypingCompleters.CompleterBase.html</file>
       <file>eric6.QScintilla.TypingCompleters.CompleterPython.html</file>
       <file>eric6.QScintilla.TypingCompleters.CompleterRuby.html</file>
+      <file>eric6.QScintilla.TypingCompleters.CompleterYaml.html</file>
       <file>eric6.QScintilla.TypingCompleters.__init__.html</file>
       <file>eric6.QScintilla.ZoomDialog.html</file>
       <file>eric6.Snapshot.SnapWidget.html</file>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Documentation/Source/eric6.QScintilla.TypingCompleters.CompleterYaml.html	Sun Sep 29 17:03:39 2019 +0200
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.QScintilla.TypingCompleters.CompleterYaml</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.QScintilla.TypingCompleters.CompleterYaml</h1>
+
+<p>
+Module implementing a typing completer for Python.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#CompleterYaml">CompleterYaml</a></td>
+<td>Class implementing typing completer for Python.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="CompleterYaml" ID="CompleterYaml"></a>
+<h2>CompleterYaml</h2>
+
+<p>
+    Class implementing typing completer for Python.
+</p>
+<h3>Derived from</h3>
+CompleterBase
+<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="#CompleterYaml.__init__">CompleterYaml</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#CompleterYaml.__inComment">__inComment</a></td>
+<td>Private method to check, if the cursor is inside a comment.</td>
+</tr>
+<tr>
+<td><a href="#CompleterYaml.charAdded">charAdded</a></td>
+<td>Public slot called to handle the user entering a character.</td>
+</tr>
+<tr>
+<td><a href="#CompleterYaml.readSettings">readSettings</a></td>
+<td>Public slot called to reread the configuration parameters.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="CompleterYaml.__init__" ID="CompleterYaml.__init__"></a>
+<h4>CompleterYaml (Constructor)</h4>
+<b>CompleterYaml</b>(<i>editor, parent=None</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>editor</i> (QScintilla.Editor)</dt>
+<dd>
+reference to the editor object
+</dd>
+<dt><i>parent</i> (QObject)</dt>
+<dd>
+reference to the parent object
+</dd>
+</dl>
+<a NAME="CompleterYaml.__inComment" ID="CompleterYaml.__inComment"></a>
+<h4>CompleterYaml.__inComment</h4>
+<b>__inComment</b>(<i>line, col</i>)
+
+<p>
+        Private method to check, if the cursor is inside a comment.
+</p>
+<dl>
+
+<dt><i>line</i> (int)</dt>
+<dd>
+current line
+</dd>
+<dt><i>col</i> (int)</dt>
+<dd>
+current position within line
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating, if the cursor is inside a comment
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl>
+<a NAME="CompleterYaml.charAdded" ID="CompleterYaml.charAdded"></a>
+<h4>CompleterYaml.charAdded</h4>
+<b>charAdded</b>(<i>charNumber</i>)
+
+<p>
+        Public slot called to handle the user entering a character.
+</p>
+<dl>
+
+<dt><i>charNumber</i> (int)</dt>
+<dd>
+value of the character entered
+</dd>
+</dl>
+<a NAME="CompleterYaml.readSettings" ID="CompleterYaml.readSettings"></a>
+<h4>CompleterYaml.readSettings</h4>
+<b>readSettings</b>(<i></i>)
+
+<p>
+        Public slot called to reread the configuration parameters.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/eric6/Documentation/Source/index-eric6.QScintilla.TypingCompleters.html	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/Documentation/Source/index-eric6.QScintilla.TypingCompleters.html	Sun Sep 29 17:03:39 2019 +0200
@@ -42,6 +42,10 @@
 <td>Module implementing a typing completer for Ruby.</td>
 </tr>
 <tr>
+<td><a href="eric6.QScintilla.TypingCompleters.CompleterYaml.html">CompleterYaml</a></td>
+<td>Module implementing a typing completer for Python.</td>
+</tr>
+<tr>
 <td><a href="eric6.QScintilla.TypingCompleters.__init__.html">TypingCompleters</a></td>
 <td>Package implementing lexers for the various supported programming languages.</td>
 </tr>
--- a/eric6/Preferences/ConfigurationPages/EditorTypingPage.py	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorTypingPage.py	Sun Sep 29 17:03:39 2019 +0200
@@ -29,10 +29,12 @@
         self.setObjectName("EditorTypingPage")

         # set initial values
-        self.pageIds = {}
-        self.pageIds[' '] = self.stackedWidget.indexOf(self.emptyPage)
-        self.pageIds['Python'] = self.stackedWidget.indexOf(self.pythonPage)
-        self.pageIds['Ruby'] = self.stackedWidget.indexOf(self.rubyPage)
+        self.pageIds = {
+            ' ': self.stackedWidget.indexOf(self.emptyPage),
+            'Python': self.stackedWidget.indexOf(self.pythonPage),
+            'Ruby': self.stackedWidget.indexOf(self.rubyPage),
+            'YAML': self.stackedWidget.indexOf(self.yamlPage),
+        }
         languages = sorted(list(self.pageIds.keys()))
         for language in languages:
             self.languageCombo.addItem(language, self.pageIds[language])
@@ -83,10 +85,30 @@
         self.rubyInsertInlineDocCheckBox.setChecked(
             Preferences.getEditorTyping("Ruby/InsertInlineDoc"))

-        # TODO: add page for Yaml settings
+        # YAML
+        self.yamlGroup.setChecked(
+            Preferences.getEditorTyping("Yaml/EnabledTypingAids"))
+        self.yamlInsertClosingBraceCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertClosingBrace"))
+        self.yamlSkipBraceCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/SkipBrace"))
+        self.yamlInsertQuoteCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertQuote"))
+        self.yamlAutoIndentationCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/AutoIndentation"))
+        self.yamlColonDetectionCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/ColonDetection"))
+        self.yamlInsertBlankDashCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertBlankDash"))
+        self.yamlInsertBlankColonCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertBlankColon"))
+        self.yamlInsertBlankQuestionCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertBlankQuestion"))
+        self.yamlInsertBlankCommaCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertBlankComma"))

         self.on_languageCombo_activated(' ')
-
+
     def save(self):
         """
         Public slot to save the Editor Typing configuration.
@@ -158,6 +180,38 @@
             "Ruby/InsertInlineDoc",
             self.rubyInsertInlineDocCheckBox.isChecked())

+        # YAML
+        Preferences.setEditorTyping(
+            "Yaml/EnabledTypingAids",
+            self.yamlGroup.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertClosingBrace",
+            self.yamlInsertClosingBraceCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/SkipBrace",
+            self.yamlSkipBraceCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertQuote",
+            self.yamlInsertQuoteCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/AutoIndentation",
+            self.yamlAutoIndentationCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/ColonDetection",
+            self.yamlColonDetectionCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertBlankDash",
+            self.yamlInsertBlankDashCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertBlankColon",
+            self.yamlInsertBlankColonCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertBlankQuestion",
+            self.yamlInsertBlankQuestionCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertBlankComma",
+            self.yamlInsertBlankCommaCheckBox.isChecked())
+
     @pyqtSlot(str)
     def on_languageCombo_activated(self, language):
         """
--- a/eric6/Preferences/ConfigurationPages/EditorTypingPage.ui	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorTypingPage.ui	Sun Sep 29 17:03:39 2019 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>543</width>
-    <height>531</height>
+    <height>518</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -414,6 +414,173 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="yamlPage">
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="yamlGroup">
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Select to enable YAML typing aids</string>
+         </property>
+         <property name="title">
+          <string>Enable YAML typing aids</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <widget class="QCheckBox" name="yamlInsertClosingBraceCheckBox">
+            <property name="toolTip">
+             <string>Select to insert a closing parenthesis</string>
+            </property>
+            <property name="text">
+             <string>Automatic parenthesis insertion</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="_2">
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="yamlSkipBraceCheckBox">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="toolTip">
+               <string>Select to skip matching braces when typing</string>
+              </property>
+              <property name="text">
+               <string>Automatically skip matching braces when typing</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>131</width>
+                <height>21</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="yamlColonDetectionCheckBox">
+            <property name="toolTip">
+             <string>Select to skip a ':', if typed next to another ':'</string>
+            </property>
+            <property name="text">
+             <string>Automatic colon detection</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="yamlAutoIndentationCheckBox">
+            <property name="toolTip">
+             <string>Select to indent after typing 'return'</string>
+            </property>
+            <property name="text">
+             <string>Automatic indent after ':', '-', '|', '|-', '|+', '&gt;', '&gt;-', '&gt;+'</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="yamlInsertQuoteCheckBox">
+            <property name="toolTip">
+             <string>Select to insert the matching quote character</string>
+            </property>
+            <property name="text">
+             <string>Automatic quote insertion</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="yamlInsertBlankColonCheckBox">
+            <property name="toolTip">
+             <string>Select to insert a blank after ':'</string>
+            </property>
+            <property name="text">
+             <string>Automatic insertion of ' ' (blank) after ':'</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="yamlInsertBlankDashCheckBox">
+            <property name="toolTip">
+             <string>Select to insert a blank after '-'</string>
+            </property>
+            <property name="text">
+             <string>Automatic insertion of ' ' (blank) after '-'</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="yamlInsertBlankQuestionCheckBox">
+            <property name="toolTip">
+             <string>Select to insert a blank after '?'</string>
+            </property>
+            <property name="text">
+             <string>Automatic insertion of ' ' (blank) after '?'</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="yamlInsertBlankCommaCheckBox">
+            <property name="toolTip">
+             <string>Select to insert a blank after ','</string>
+            </property>
+            <property name="text">
+             <string>Automatic insertion of ' ' (blank) after ','</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>89</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>
@@ -464,12 +631,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>118</x>
-     <y>113</y>
+     <x>139</x>
+     <y>141</y>
     </hint>
     <hint type="destinationlabel">
-     <x>162</x>
-     <y>139</y>
+     <x>210</x>
+     <y>172</y>
     </hint>
    </hints>
   </connection>
@@ -480,12 +647,12 @@
    <slot>setChecked(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>215</x>
-     <y>113</y>
+     <x>236</x>
+     <y>141</y>
     </hint>
     <hint type="destinationlabel">
-     <x>198</x>
-     <y>137</y>
+     <x>246</x>
+     <y>172</y>
     </hint>
    </hints>
   </connection>
@@ -496,12 +663,44 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>82</x>
-     <y>271</y>
+     <x>103</x>
+     <y>353</y>
     </hint>
     <hint type="destinationlabel">
-     <x>92</x>
-     <y>297</y>
+     <x>140</x>
+     <y>384</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>yamlInsertClosingBraceCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>yamlSkipBraceCheckBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>104</x>
+     <y>128</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>106</x>
+     <y>160</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>yamlInsertClosingBraceCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>yamlSkipBraceCheckBox</receiver>
+   <slot>setChecked(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>222</x>
+     <y>129</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>222</x>
+     <y>160</y>
     </hint>
    </hints>
   </connection>
--- a/eric6/Preferences/__init__.py	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/Preferences/__init__.py	Sun Sep 29 17:03:39 2019 +0200
@@ -703,11 +703,12 @@
         "Yaml/InsertClosingBrace": True,
         "Yaml/SkipBrace": True,
         "Yaml/InsertQuote": True,
-        "Yaml/IndentAfterColon": True,
+        "Yaml/AutoIndentation": True,
         "Yaml/ColonDetection": True,
         "Yaml/InsertBlankDash": True,
         "Yaml/InsertBlankColon": True,
         "Yaml/InsertBlankQuestion": True,
+        "Yaml/InsertBlankComma": True,
     }

     editorExporterDefaults = {
--- a/eric6/QScintilla/TypingCompleters/CompleterPython.py	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/QScintilla/TypingCompleters/CompleterPython.py	Sun Sep 29 17:03:39 2019 +0200
@@ -29,7 +29,7 @@
         @param editor reference to the editor object (QScintilla.Editor)
         @param parent reference to the parent object (QObject)
         """
-        CompleterBase.__init__(self, editor, parent)
+        super(CompleterPython, self).__init__(editor, parent)

         self.__defRX = QRegExp(r"""^[ \t]*def \w+\(""")
         self.__defSelfRX = QRegExp(r"""^[ \t]*def \w+\([ \t]*self[ \t]*[,)]""")
--- a/eric6/QScintilla/TypingCompleters/CompleterRuby.py	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/QScintilla/TypingCompleters/CompleterRuby.py	Sun Sep 29 17:03:39 2019 +0200
@@ -29,7 +29,7 @@
         @param editor reference to the editor object (QScintilla.Editor)
         @param parent reference to the parent object (QObject)
         """
-        CompleterBase.__init__(self, editor, parent)
+        super(CompleterRuby, self).__init__(editor, parent)

         self.__beginRX = QRegExp(r"""^=begin """)
         self.__beginNlRX = QRegExp(r"""^=begin\r?\n""")
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/QScintilla/TypingCompleters/CompleterYaml.py	Sun Sep 29 17:03:39 2019 +0200
@@ -0,0 +1,187 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2019 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a typing completer for Python.
+"""
+
+import re
+
+from PyQt5.Qsci import QsciScintilla
+
+from .CompleterBase import CompleterBase
+
+import Preferences
+
+
+class CompleterYaml(CompleterBase):
+    """
+    Class implementing typing completer for Python.
+    """
+    def __init__(self, editor, parent=None):
+        """
+        Constructor
+
+        @param editor reference to the editor object
+        @type QScintilla.Editor
+        @param parent reference to the parent object
+        @type QObject
+        """
+        super(CompleterYaml, self).__init__(editor, parent)
+
+        self.readSettings()
+
+    def readSettings(self):
+        """
+        Public slot called to reread the configuration parameters.
+        """
+        self.setEnabled(
+            Preferences.getEditorTyping("Yaml/EnabledTypingAids"))
+        self.__insertClosingBrace = Preferences.getEditorTyping(
+            "Yaml/InsertClosingBrace")
+        self.__skipBrace = Preferences.getEditorTyping(
+            "Yaml/SkipBrace")
+        self.__insertQuote = Preferences.getEditorTyping(
+            "Yaml/InsertQuote")
+        self.__autoIndentation = Preferences.getEditorTyping(
+            "Yaml/AutoIndentation")
+        self.__colonDetection = Preferences.getEditorTyping(
+            "Yaml/ColonDetection")
+        self.__insertBlankDash = Preferences.getEditorTyping(
+            "Yaml/InsertBlankDash")
+        self.__insertBlankColon = Preferences.getEditorTyping(
+            "Yaml/InsertBlankColon")
+        self.__insertBlankQuestion = Preferences.getEditorTyping(
+            "Yaml/InsertBlankQuestion")
+        self.__insertBlankComma = Preferences.getEditorTyping(
+            "Yaml/InsertBlankComma")
+
+    def charAdded(self, charNumber):
+        """
+        Public slot called to handle the user entering a character.
+
+        @param charNumber value of the character entered
+        @type int
+        """
+        char = chr(charNumber)
+        if char not in ['{', '}', '[', ']', "'", '"', '-', ':', '?', ',',
+                        '\n']:
+            return  # take the short route
+
+        line, col = self.editor.getCursorPosition()
+
+        if self.__inComment(line, col):
+            return
+
+        # open curly brace
+        # insert closing brace
+        if char == '{':
+            if self.__insertClosingBrace:
+                self.editor.insert('}')
+
+        # open bracket
+        # insert closing bracket
+        elif char == '[':
+            if self.__insertClosingBrace:
+                self.editor.insert(']')
+
+        # closing parenthesis
+        # skip matching closing parenthesis
+        elif char in ['}', ']']:
+            txt = self.editor.text(line)
+            if col < len(txt) and char == txt[col]:
+                if self.__skipBrace:
+                    self.editor.setSelection(line, col, line, col + 1)
+                    self.editor.removeSelectedText()
+
+        # dash
+        # insert blank
+        elif char == '-':
+            if self.__insertBlankDash:
+                self.editor.insert(' ')
+                self.editor.setCursorPosition(line, col + 1)
+
+        # colon
+        # 1. skip colon if not last character
+        # 2. insert blank if last character
+        elif char == ':':
+            text = self.editor.text(line)
+            if col < len(text) and char == text[col]:
+                if self.__colonDetection:
+                    self.editor.setSelection(line, col, line, col + 1)
+                    self.editor.removeSelectedText()
+            elif self.__insertBlankColon:
+                if col == len(text.rstrip()):
+                    self.editor.insert(' ')
+                    self.editor.setCursorPosition(line, col + 1)
+
+        # question mark
+        # insert blank
+        elif char == '?':
+            if self.__insertBlankQuestion:
+                self.editor.insert(' ')
+                self.editor.setCursorPosition(line, col + 1)
+
+        # comma
+        # insert blank
+        elif char == ',':
+            if self.__insertBlankComma:
+                self.editor.insert(' ')
+                self.editor.setCursorPosition(line, col + 1)
+
+        # double quote
+        # insert double quote
+        elif char == '"':
+            if self.__insertQuote:
+                self.editor.insert('"')
+
+        # quote
+        # insert quote
+        elif char == "'":
+            if self.__insertQuote:
+                self.editor.insert("'")
+
+        # new line
+        # indent after line ending with ':'
+        elif char == '\n':
+            if self.__autoIndentation:
+                txt = self.editor.text(line - 1)
+                match = re.search(
+                    "(?:\||\|-|\|\+|>|>-|>\+|-|:)(\s*)\r?\n",
+                    # __IGNORE_WARNING_W605__
+                    txt)
+                if match is not None:
+                    startBlanks = match.start(1)
+                    endBlanks = match.end(1)
+                    if startBlanks != -1 and startBlanks != endBlanks:
+                        # previous line ends with whitespace, e.g. caused by
+                        # blank insertion above
+                        self.editor.setSelection(line - 1, startBlanks,
+                                                 line - 1, endBlanks)
+                        self.editor.removeSelectedText()
+
+                    self.editor.indent(line)
+                    self.editor.setCursorPosition(line, 0)
+                    self.editor.editorCommand(QsciScintilla.SCI_VCHOME)
+
+    def __inComment(self, line, col):
+        """
+        Private method to check, if the cursor is inside a comment.
+
+        @param line current line
+        @type int
+        @param col current position within line
+        @type int
+        @return flag indicating, if the cursor is inside a comment
+        @rtype bool
+        """
+        txt = self.editor.text(line)
+        if col == len(txt):
+            col -= 1
+        while col >= 0:
+            if txt[col] == "#":
+                return True
+            col -= 1
+        return False
--- a/eric6/QScintilla/TypingCompleters/__init__.py	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/QScintilla/TypingCompleters/__init__.py	Sun Sep 29 17:03:39 2019 +0200
@@ -24,7 +24,9 @@
         elif language == "Ruby":
             from .CompleterRuby import CompleterRuby
             return CompleterRuby(editor, parent)
-        # TODO: add typing completer for Yaml
+        elif language == "YAML":
+            from .CompleterYaml import CompleterYaml
+            return CompleterYaml(editor, parent)
         else:
             return None
     except ImportError:
--- a/eric6/i18n/eric6_cs.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_cs.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15702,12 +15702,12 @@
         <translation>Programovací jazyk:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation>Vybrat pro vkládání uzavíracích závorek</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation>Automatické vkládání závorek</translation>
     </message>
@@ -15722,12 +15722,12 @@
         <translation type="obsolete">Po &apos;(&apos; odsatit na její úroveň</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation>Vybrat pro vložení doplňující uvozovky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation>Automatické doplnění uvozovky</translation>
     </message>
@@ -15762,12 +15762,12 @@
         <translation>Automatické vložení &apos;self&apos; při zápisu metody</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation>Vybrat pro vložení mezery po &apos;,&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation>Automatické vložení mezery po &apos;,&apos;</translation>
     </message>
@@ -15777,22 +15777,22 @@
         <translation>Vybrat programovací jazyk, který má být konfigurován.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation>Vybrat pro přeskočení párových závorek při psaní</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation>Při psaní automaticky přeskočit párové závorky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation>Vybrat pro přeskočení &apos;:&apos;, je-li zapsána další &apos;:&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation>Automatická detekce dvojtečky</translation>
     </message>
@@ -15867,7 +15867,7 @@
         <translation>Automatické dedent &apos;def&apos; vyýrazů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15891,6 +15891,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -47067,7 +47112,7 @@
         <translation>Soubor načten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>Beze jména</translation>
     </message>
@@ -47077,22 +47122,22 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>Vybrat vše</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>Zrušit celý výběr</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>Jazyky</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>Žádný jazyk</translation>
     </message>
@@ -47179,22 +47224,22 @@
         <translation>Tisk aktuálního souboru</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>Tisk...</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>Tisk je hotov</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>Chyba během tisku</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>Tisk je hotov</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>Chyba během tisku</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>Tisk byl zrušen</translation>
     </message>
@@ -47219,22 +47264,22 @@
         <translation>&lt;b&gt;Náhkled tisku&lt;/b&gt;&lt;p&gt;Náhkled tisku aktuálního souboru.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>Odhadem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>Alternativy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Pygments Lexer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Použít Pygments lexer.</translation>
     </message>
@@ -47269,7 +47314,7 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation>Alternativy ({0})</translation>
     </message>
@@ -47314,12 +47359,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51874,17 +51919,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
Binary file eric6/i18n/eric6_de.qm has changed
--- a/eric6/i18n/eric6_de.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_de.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15472,22 +15472,22 @@
         <translation>Programmiersprache:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation>Auswählen, um eine schließende Klammer einzufügen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation>Automatisch Klammern einfügen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation>Auswählen, um ein passendes Anführungszeichen einzufügen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation>Anführungszeichen automatisch einfügen</translation>
     </message>
@@ -15517,12 +15517,12 @@
         <translation>„self“ beim Deklarieren von Methoden automatisch einfügen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation>Auswählen, um ein Leerzeichen nach „,“ einzufügen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation>Nach „,“ automatisch „ “ (Leerzeichen) einfügen</translation>
     </message>
@@ -15532,22 +15532,22 @@
         <translation>Wähle die zu konfigurierende Programmiersprache aus.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation>Auswählen, um bei der Eingabe gleiche Klammern zu überspringen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation>Gleiche Klammern bei der Eingabe automatisch überspringen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation>Auswählen, um ein „:“ zu überspringen, wenn es neben einem „:“ eingegeben wird</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation>Automatische Doppelpunkterkennung</translation>
     </message>
@@ -15612,7 +15612,7 @@
         <translation>„def“-Ausdrücke automatisch ausrücken</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation>Auswählen, um nach einem Zeilenvorschub einzurücken</translation>
     </message>
@@ -15636,6 +15636,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation>Erzeuge &apos;(...)&apos; Imports</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation>Auswählen, um die YAML Eingabehilfen zu aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation>Aktiviere YAML Eingabehilfen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation>Automatische Einrückung nach &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation>Auswählen, um ein Leerzeichen nach „:“ einzufügen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation>Nach „:“ automatisch „ “ (Leerzeichen) einfügen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation>Auswählen, um ein Leerzeichen nach „-“ einzufügen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation>Nach „-“ automatisch „ “ (Leerzeichen) einfügen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation>Auswählen, um ein Leerzeichen nach „?“ einzufügen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation>Nach „?“ automatisch „ “ (Leerzeichen) einfügen</translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -44768,7 +44813,7 @@
         <translation>Datei geladen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>Unbenannt</translation>
     </message>
@@ -44783,22 +44828,22 @@
         <translation>Mini Editor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>Auswahl aufheben</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>Sprachen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>Keine Sprache</translation>
     </message>
@@ -44885,22 +44930,22 @@
         <translation>Druckt die aktuelle Datei</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>Drucke...</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>Drucken beendet</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>Fehler beim Drucken</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>Drucken beendet</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>Fehler beim Drucken</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>Drucken abgebrochen</translation>
     </message>
@@ -44925,27 +44970,27 @@
         <translation>&lt;b&gt;Druckvorschau&lt;/b&gt;&lt;p&gt;Zeift eine Druckvorschau der aktuellen Datei.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>Ermittelt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>Alternativen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation>Alternativen ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Pygments Lexer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
     </message>
@@ -45015,12 +45060,12 @@
         <translation>&lt;b&gt;Kopie speichern&lt;/b&gt;&lt;p&gt;Speichern einer Kopie des Inhalts des aktuellen Editorfensters. Die Datei kann mit einem Dateiauswahldialog eingegeben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation>EditorConfig Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die EditorConfig Eigenschaften für die Datei &lt;b&gt;{0}&lt;/b&gt; konnten nicht geladen werden.&lt;/p&gt;</translation>
     </message>
@@ -49483,17 +49528,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
--- a/eric6/i18n/eric6_empty.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_empty.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15378,42 +15378,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15453,12 +15453,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15503,7 +15503,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15527,6 +15527,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -44702,7 +44747,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -44717,77 +44762,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49235,17 +49280,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
--- a/eric6/i18n/eric6_en.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_en.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15392,42 +15392,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15467,12 +15467,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15517,7 +15517,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15541,6 +15541,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -44707,7 +44752,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -44722,67 +44767,67 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -44822,12 +44867,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49276,17 +49321,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
--- a/eric6/i18n/eric6_es.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_es.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15925,42 +15925,42 @@
         <translation>Habilitar ayuda al tecleo Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation>Seleccionar para insertar un paréntesis de cierre</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation>Inserción de paréntesis automática</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation>Seleccionar para saltarse llaves coincidentes al teclear</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation>Saltarse automáticamente  llaves coincidentes al teclear</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation>Seleccionar para evitar un &apos;:&apos;, si es tecleado cerca de otro &apos;:&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation>Detección automática de los dos puntos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation>Seleccionar para insertar el carácter de comillas de cierre</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation>Inserción automatica de comillas</translation>
     </message>
@@ -16000,12 +16000,12 @@
         <translation>Inserción automatica de &apos;self&apos; cuando se declaran métodos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation>Seleccionar para insertar un espacio en blanco despues de &apos;,&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation>Seleccionar para habilitar ayuda de Ruby al tecleo</translation>
     </message>
@@ -16050,7 +16050,7 @@
         <translation>Desindentación automática de elementos &apos;def&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation>Seleccionar para indentar tras introducir &apos;retorno&apos;</translation>
     </message>
@@ -16074,6 +16074,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation>Generar import de tipo &apos;(...)&apos;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -48858,7 +48903,7 @@
         <translation>Archivo guardado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>Sin título</translation>
     </message>
@@ -48868,22 +48913,22 @@
         <translation>Mini Editor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>Deseleccionar todo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>Lenguajes</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>Ningún Lenguaje</translation>
     </message>
@@ -48914,22 +48959,22 @@
         <translation>Imprime el archivo actual</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>Imprimiendo...</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>Impresión completa</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>Error mientras se imprimía</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>Impresión completa</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>Error mientras se imprimía</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>Impresión cancelada</translation>
     </message>
@@ -48954,22 +48999,22 @@
         <translation>&lt;b&gt;Presentación Preliminar&lt;/b&gt;&lt;p&gt;Presentación preliminar del texto de ayuda mostrado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>Suposición</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>Alternativas</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Analizador Léxico de Pygments</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Seleccionar el Analizador Léxico de Pygments a aplicar.</translation>
     </message>
@@ -49004,7 +49049,7 @@
         <translation>{0}[*] - {1}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation>Alternativas ({0})</translation>
     </message>
@@ -49049,12 +49094,12 @@
         <translation>&lt;b&gt;Guardar Copia&lt;/b&gt;&lt;p&gt;Guardar una copia del contenido de la ventana de editor actual. El archivo puede ser introducido usando un diálogo de selección de archivo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation>Propiedades de EditorConfig</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Las propiedades de EditorConfig para el archivo &lt;b&gt;{0}&lt;/b&gt; no se ha podido cargar.&lt;/p&gt;</translation>
     </message>
@@ -53733,17 +53778,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
--- a/eric6/i18n/eric6_fr.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_fr.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15643,17 +15643,17 @@
         <translation>Sélectionner le langage de programmation à configurer.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation>Cocher pour insérer automatiquement les parenthèses fermantes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation>Insertion automatique des parenthèses</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation>Cocher pour ignorer le doublon de parenthèse fermante &quot;)&quot; dû à la fermeture
 automatique des parenthèses. Lorsqu&apos;on tape une parenthèse fermante alors
@@ -15661,17 +15661,17 @@
 et le curseurest placé après la parenthèse fermante</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation>Ignorer automatiquement les parenthèses fermantes doublées au cours de la frappe</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation>Cocher pour corriger automatiquement les doublons de &apos;:&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation>Détection automatique des deux points doublés</translation>
     </message>
@@ -15686,12 +15686,12 @@
         <translation type="obsolete">Après une parenthèse ouvrante &apos;(&apos;, indenter le texte au même niveau </translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation>Cocher pour insérer automatiquement les guillemets fermants correspondnants (&apos;,&quot;..)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation>Insertion automatique des guillemets</translation>
     </message>
@@ -15726,12 +15726,12 @@
         <translation>Insertion automatique du mot &apos;self&apos; lors de la déclaration des méthodes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation>Cocher pour insérer un blanc après &apos;,&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation>Insertion automatique de &apos; &apos; (espace) après &apos;,&apos;</translation>
     </message>
@@ -15806,7 +15806,7 @@
         <translation>Désindentation automatique des instructions &apos;def&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15830,6 +15830,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -46278,7 +46323,7 @@
         <translation>Fichier chargé</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>SansTitre</translation>
     </message>
@@ -46288,22 +46333,22 @@
         <translation>Mini éditeur</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>Tout sélectionner</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>Tout déselectionner</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>Langages</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>Pas de langage</translation>
     </message>
@@ -46390,22 +46435,22 @@
         <translation>Imprime le fichier courant</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>Impression....</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>Impression terminée</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>Erreur durant l&apos;impression</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>Impression terminée</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>Erreur durant l&apos;impression</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>Impression abandonnée</translation>
     </message>
@@ -46430,22 +46475,22 @@
         <translation>&lt;b&gt;Aperçu avant impression&lt;/b&gt;&lt;p&gt;Aperçu avant impression du fichier courant.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>Suggestion</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>Alternatives</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Analyseur Pygments</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Sélectionne l&apos;analyseur Pygments à appliquer.</translation>
     </message>
@@ -46480,7 +46525,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46525,12 +46570,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51062,17 +51107,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
--- a/eric6/i18n/eric6_it.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_it.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15930,32 +15930,32 @@
         <translation>Seleziona il linguaggio di programmazione da configurare.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation>Seleziona per inserire una parentesi di chiusura</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation>Inserimento automatio delle parentesi</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation>Seleziona per evitare il bilanciamento della parentesi durante la scrittura</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation>Salta automaticamente il bilanciamento delle parentesi durante la scrittura</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation>Seleziona per saltare un &apos;:&apos;, se scritto di seguito ad un altro &apos;:&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation>Rilevamento automatico punti</translation>
     </message>
@@ -15970,12 +15970,12 @@
         <translation type="obsolete">Dopo &apos;(&apos; identa al suo livello</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation>Seleziona per inserire le virgolette per bilanciare</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation>Inserimento automatico virgolette</translation>
     </message>
@@ -16010,12 +16010,12 @@
         <translation>Inserimento automatico di &apos;self&apos; quando si dichiara un metodo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation>Seleziona per inserire uno spazio dopo &apos;,&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation>Inserimento automatico di &apos;&apos; (vuoto) sopo &apos;,&apos;</translation>
     </message>
@@ -16090,7 +16090,7 @@
         <translation>Deindentazione automatico dei costrutti &apos;def&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16114,6 +16114,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -48336,7 +48381,7 @@
         <translation>File caricato</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>Senza titolo</translation>
     </message>
@@ -48346,22 +48391,22 @@
         <translation>Mini Editor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>Seleziona tutti</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>Deseleziona tutti</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>Linguaggi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>Nessun linguaggio</translation>
     </message>
@@ -48448,22 +48493,22 @@
         <translation>Stampa il file corrente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>In stampa...</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>Stampa completata</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>Errore durante la stampa</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>Stampa completata</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>Errore durante la stampa</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>Stampa interrota</translation>
     </message>
@@ -48488,22 +48533,22 @@
         <translation>&lt;b&gt;Anteprima di stampa&lt;/b&gt;&lt;p&gt;Anteprima di stampa del file corrente.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>Indovinato</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>Alternativo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Analizzatore lessicale Pygments</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Selezione l&apos;analizzatore lessicale di Pygments da applicare.</translation>
     </message>
@@ -48538,7 +48583,7 @@
         <translation>{0}[*] - {1}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation>Alternative ({0})</translation>
     </message>
@@ -48583,12 +48628,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53272,17 +53317,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
--- a/eric6/i18n/eric6_pt.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_pt.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15922,42 +15922,42 @@
         <translation>Habilitar ajuda de escritura Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16012,12 +16012,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16062,7 +16062,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16086,6 +16086,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -47977,7 +48022,7 @@
         <translation>Ficheiro gravado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>Sem Título</translation>
     </message>
@@ -47992,67 +48037,67 @@
         <translation>Mini Editor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>A imprimir...</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>Impressão completa</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>Erro durante a impressão</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>Impressão completa</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>Erro durante a impressão</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>Impressão cancelada</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>Selecionar tudo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>Desselecionar tudo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>Idiomas</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>Sem Idioma</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>Adivinhado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>Alternativas</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation>Alternativas ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Analizador Léxico Pygments</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Selecionar o analizador léxico Pygments a aplicar.</translation>
     </message>
@@ -48092,12 +48137,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52693,17 +52738,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
--- a/eric6/i18n/eric6_ru.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_ru.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15527,42 +15527,42 @@
         <translation>Вспомогательные средства при наборе кода Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation>Разрешить автоматическую вставку закрывающей скобки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation>Автоматическая вставка закрывающей скобки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation>Пропускать соотвествующие скобки при наборе</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation>Автоматически пропускать соотвествующие скобки при печати</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation>Пропускать двоеточие, если оно набрано сразу за другим двоеточием</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation>Автоматическое определение двоеточия</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation>Разрешить автоматическую вставку закрывающей кавычки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation>Автоматическая вставка закрывающей кавычки</translation>
     </message>
@@ -15602,12 +15602,12 @@
         <translation>Автоматически вставлять &apos;self&apos; при объявлении метода</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation>Разрешить вставлять пробел после &apos;,&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation>Автоматически вставлять пробел после &apos;,&apos;</translation>
     </message>
@@ -15652,7 +15652,7 @@
         <translation>Автоматическая вставка &apos;=end&apos; после &apos;=begin&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation>Разрешить отступ после нажания &apos;return&apos;</translation>
     </message>
@@ -15676,6 +15676,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation>Генерировать import &apos;(...)&apos;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -44978,7 +45023,7 @@
         <translation>Файл сохранён</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>Без имени</translation>
     </message>
@@ -44993,67 +45038,67 @@
         <translation>Миниредактор</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>Печать...</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>Печать завершена</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>Ошибка печати</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>Печать завершена</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>Ошибка печати</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>Печать прервана</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>Выбрать всё</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>Снять выделение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>Языки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>Нет языка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>Предполагаемый язык</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>Альтернативная подсветка</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation>Альтернативы ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Лексер Pygments</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Выберите для использования лексер Pygments.</translation>
     </message>
@@ -45093,12 +45138,12 @@
         <translation>&lt;b&gt;Сохранить копию&lt;/b&gt;&lt;p&gt;Сохранение контента текущего окна редактора. Имя файла может быть введено в диалоге выбора файла.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation>Свойства EditorConfig</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удается загрузить свойства EditorConfig для файла &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
@@ -49563,17 +49608,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation>
     </message>
--- a/eric6/i18n/eric6_tr.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_tr.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15748,42 +15748,42 @@
         <translation>Python yazım yardımını etkinleştir</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation>Parantezleri otomatik olarak ekle</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation>Otomatik tırnak işareti eklemek</translation>
     </message>
@@ -15828,12 +15828,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15878,7 +15878,7 @@
         <translation>=end ve =begin ifadelerinden sonra otomatik girinti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15902,6 +15902,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -47292,7 +47337,7 @@
         <translation>Dosya Kaydedildi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>Başlıksız</translation>
     </message>
@@ -47307,67 +47352,67 @@
         <translation>Mini Düzenleyici</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>Yazılıyor...</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>Yazdırma tamalandı</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>Yazdırılırken hata</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>Yazdırma tamalandı</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>Yazdırılırken hata</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>Yazdırma iptal edildi</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>Hepsini seç</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>Tüm seçimi iptal et</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>Diller</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>Dil Yok</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>Tahmin edilen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>Alternatifler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation>Alternatifler ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Pygments Lexer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Kullanmak için Pygment lexer seç.</translation>
     </message>
@@ -47412,12 +47457,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51985,17 +52030,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
--- a/eric6/i18n/eric6_zh_CN.ts	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/i18n/eric6_zh_CN.ts	Sun Sep 29 17:03:39 2019 +0200
@@ -15698,32 +15698,32 @@
         <translation>开启 Python 输入辅助</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="332"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="443"/>
         <source>Select to insert a closing parenthesis</source>
         <translation>选择插入封闭括号</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="335"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="446"/>
         <source>Automatic parenthesis insertion</source>
         <translation>自动插入括号</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="474"/>
         <source>Select to skip matching braces when typing</source>
         <translation>选择在输入时跳过配对括号</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="477"/>
         <source>Automatically skip matching braces when typing</source>
         <translation>输入时自动跳过配对括号</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="155"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="499"/>
         <source>Select to skip a &apos;:&apos;, if typed next to another &apos;:&apos;</source>
         <translation>选择跳过“：”，如果输入的下一个符号是另一个“：”</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="158"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="502"/>
         <source>Automatic colon detection</source>
         <translation>自动检测冒号</translation>
     </message>
@@ -15738,12 +15738,12 @@
         <translation type="obsolete">在“( ”后进行缩进</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="362"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="519"/>
         <source>Select to insert the matching quote character</source>
         <translation>选择插入配对的引号</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="365"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="522"/>
         <source>Automatic quote insertion</source>
         <translation>自动插入引号</translation>
     </message>
@@ -15798,12 +15798,12 @@
         <translation>在声明方法时自动插入“self ”</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="372"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="559"/>
         <source>Select to insert a blank after &apos;,&apos;</source>
         <translation>选择在“,”后插入一个空格</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="375"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="562"/>
         <source>Automatic insertion of &apos; &apos; (blank) after &apos;,&apos;</source>
         <translation>在“,”后自动插入空格</translation>
     </message>
@@ -15848,7 +15848,7 @@
         <translation>自动取消“def”语句的缩进</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="352"/>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="509"/>
         <source>Select to indent after typing &apos;return&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15872,6 +15872,51 @@
         <source>Generate &apos;(...)&apos; type import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="431"/>
+        <source>Select to enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="434"/>
+        <source>Enable YAML typing aids</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="512"/>
+        <source>Automatic indent after &apos;:&apos;, &apos;-&apos;, &apos;|&apos;, &apos;|-&apos;, &apos;|+&apos;, &apos;&gt;&apos;, &apos;&gt;-&apos;, &apos;&gt;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+        <source>Select to insert a blank after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;:&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+        <source>Select to insert a blank after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+        <source>Select to insert a blank after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+        <source>Automatic insertion of &apos; &apos; (blank) after &apos;?&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailDialog</name>
@@ -47772,7 +47817,7 @@
         <translation>文件已保存</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2805"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2800"/>
         <source>Untitled</source>
         <translation>未命名</translation>
     </message>
@@ -47782,62 +47827,62 @@
         <translation>迷你编辑器</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2768"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2763"/>
         <source>Printing...</source>
         <translation>打印中…</translation>
     </message>
     <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2781"/>
+        <source>Printing completed</source>
+        <translation>打印已完成</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/MiniEditor.py" line="2783"/>
+        <source>Error while printing</source>
+        <translation>打印时出错</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/MiniEditor.py" line="2786"/>
-        <source>Printing completed</source>
-        <translation>打印已完成</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2788"/>
-        <source>Error while printing</source>
-        <translation>打印时出错</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2791"/>
         <source>Printing aborted</source>
         <translation>打印失败</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2846"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2841"/>
         <source>Select all</source>
         <translation>全选</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2847"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2842"/>
         <source>Deselect all</source>
         <translation>全部取消选择</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2861"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2856"/>
         <source>Languages</source>
         <translation>语言</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2864"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2859"/>
         <source>No Language</source>
         <translation>无语言</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2888"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2883"/>
         <source>Guessed</source>
         <translation>猜测</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2909"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2904"/>
         <source>Alternatives</source>
         <translation>备选</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Pygments Lexer</source>
         <translation>Pygments 词法分析器</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2923"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2918"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>选择要应用的 Pygments 词法分析器。</translation>
     </message>
@@ -47877,7 +47922,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="2906"/>
+        <location filename="../QScintilla/MiniEditor.py" line="2901"/>
         <source>Alternatives ({0})</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47922,12 +47967,12 @@
         <translation>&lt;b&gt;保存副本&lt;/b&gt;保存当前编辑器窗口内容的一个副本。文件可以在文件选择对话框中输入。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/MiniEditor.py" line="3446"/>
+        <location filename="../QScintilla/MiniEditor.py" line="3441"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52601,17 +52646,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1585"/>
+        <location filename="../Preferences/__init__.py" line="1596"/>
         <source>Export Preferences</source>
         <translation>导出首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Import Preferences</source>
         <translation>导入首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1613"/>
+        <location filename="../Preferences/__init__.py" line="1624"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>属性文件 (*.ini);;所有文件 (*)</translation>
     </message>
docs/changelog		file \| annotate \| diff \| comparison \| revisions
eric6.e4p		file \| annotate \| diff \| comparison \| revisions
eric6/APIs/Python3/eric6.api		file \| annotate \| diff \| comparison \| revisions
eric6/APIs/Python3/eric6.bas		file \| annotate \| diff \| comparison \| revisions
eric6/Documentation/Help/source.qch		file \| annotate \| diff \| comparison \| revisions
eric6/Documentation/Help/source.qhp		file \| annotate \| diff \| comparison \| revisions
eric6/Documentation/Source/eric6.QScintilla.TypingCompleters.CompleterYaml.html		file \| annotate \| diff \| comparison \| revisions
eric6/Documentation/Source/index-eric6.QScintilla.TypingCompleters.html		file \| annotate \| diff \| comparison \| revisions
eric6/Preferences/ConfigurationPages/EditorTypingPage.py		file \| annotate \| diff \| comparison \| revisions
eric6/Preferences/ConfigurationPages/EditorTypingPage.ui		file \| annotate \| diff \| comparison \| revisions
eric6/Preferences/__init__.py		file \| annotate \| diff \| comparison \| revisions
eric6/QScintilla/TypingCompleters/CompleterPython.py		file \| annotate \| diff \| comparison \| revisions
eric6/QScintilla/TypingCompleters/CompleterRuby.py		file \| annotate \| diff \| comparison \| revisions
eric6/QScintilla/TypingCompleters/CompleterYaml.py		file \| annotate \| diff \| comparison \| revisions
eric6/QScintilla/TypingCompleters/__init__.py		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_cs.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_de.qm		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_de.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_empty.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_en.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_es.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_fr.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_it.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_pt.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_ru.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_tr.ts		file \| annotate \| diff \| comparison \| revisions
eric6/i18n/eric6_zh_CN.ts		file \| annotate \| diff \| comparison \| revisions