Mercurial Repositories > eric / file diff

--- 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>