--- 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 ':', if typed next to another ':'</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 ','</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 ' ' (blank) after ','</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 'return'</source>
<translation type="unfinished"></translation>
</message>
@@ -15872,6 +15872,51 @@
<source>Generate '(...)' 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 ':', '-', '|', '|-', '|+', '>', '>-', '>+'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="529"/>
+ <source>Select to insert a blank after ':'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="532"/>
+ <source>Automatic insertion of ' ' (blank) after ':'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="539"/>
+ <source>Select to insert a blank after '-'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="542"/>
+ <source>Automatic insertion of ' ' (blank) after '-'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="549"/>
+ <source>Select to insert a blank after '?'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorTypingPage.ui" line="552"/>
+ <source>Automatic insertion of ' ' (blank) after '?'</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><b>保存副本</b>保存当前编辑器窗口内容的一个副本。文件可以在文件选择对话框中输入。</p></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><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></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>
