--- a/i18n/eric6_zh_CN.GB2312.ts Sat Feb 07 11:35:39 2015 +0100
+++ b/i18n/eric6_zh_CN.GB2312.ts Sat Feb 07 12:38:32 2015 +0100
@@ -3924,213 +3924,213 @@
<translation>图标</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
<source>Network</source>
<translation>网络</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="155"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="158"/>
<source>Plugin Manager</source>
<translation>插件管理器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="332"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
<source>Printer</source>
<translation>打印机</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
<source>Python</source>
<translation>Python</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
- <source>Shell</source>
- <translation>命令行</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="174"/>
- <source>Tasks</source>
- <translation>任务</translation>
+ <source>Shell</source>
+ <translation>命令行</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationDialog.py" line="177"/>
+ <source>Tasks</source>
+ <translation>任务</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="180"/>
<source>Templates</source>
<translation>模板</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="183"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="186"/>
<source>Version Control Systems</source>
<translation>版本控制系统</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
<source>Debugger</source>
<translation>调试器</translation>
</message>
<message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+ <source>General</source>
+ <translation>通用配置</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
+ <source>Ruby</source>
+ <translation>Ruby</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
+ <source>Editor</source>
+ <translation>编辑器</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
+ <source>APIs</source>
+ <translation>API</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="213"/>
+ <source>Autocompletion</source>
+ <translation>自动完成</translation>
+ </message>
+ <message>
<location filename="../Preferences/ConfigurationDialog.py" line="224"/>
- <source>General</source>
- <translation>通用配置</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
- <source>Ruby</source>
- <translation>Ruby</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="204"/>
- <source>Editor</source>
- <translation>编辑器</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="207"/>
- <source>APIs</source>
- <translation>API</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="210"/>
- <source>Autocompletion</source>
- <translation>自动完成</translation>
+ <source>QScintilla</source>
+ <translation>QScintilla</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationDialog.py" line="221"/>
- <source>QScintilla</source>
- <translation>QScintilla</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
<source>Calltips</source>
<translation>调用提示</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="230"/>
<source>Filehandling</source>
<translation>文件处理</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="231"/>
- <source>Searching</source>
- <translation>查找</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="234"/>
+ <source>Searching</source>
+ <translation>查找</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="237"/>
<source>Spell checking</source>
<translation>拼写检查</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
<source>Style</source>
<translation>风格</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
- <source>Typing</source>
- <translation>键盘输入</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="247"/>
+ <source>Typing</source>
+ <translation>键盘输入</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="250"/>
<source>Exporters</source>
<translation>输出器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="251"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="254"/>
<source>Highlighters</source>
<translation>高亮功能</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
<source>Filetype Associations</source>
<translation>文件类型关联</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="259"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="262"/>
<source>Styles</source>
<translation>风格</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
<source>Properties</source>
<translation>属性</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="339"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="348"/>
<source>Help Documentation</source>
<translation>帮助文档</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
<source>Help Viewers</source>
<translation>帮助浏览器</translation>
</message>
<message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+ <source>Project</source>
+ <translation>项目</translation>
+ </message>
+ <message>
<location filename="../Preferences/ConfigurationDialog.py" line="297"/>
- <source>Project</source>
- <translation>项目</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="294"/>
<source>Project Viewer</source>
<translation>项目浏览器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="300"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="303"/>
<source>Multiproject</source>
<translation>多重项目</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="326"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="329"/>
<source>Interface</source>
<translation>界面</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="311"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="314"/>
<source>Viewmanager</source>
<translation>视图管理器</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="342"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="345"/>
<source>Appearance</source>
<translation>外观</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="490"/>
<source>Preferences</source>
<translation>参数选择</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="492"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="495"/>
<source>Please select an entry of the list
to display the configuration page.</source>
<translation>请在左边选择一个列表项以显示配置页面。</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
<source>Configuration Page Error</source>
<translation>配置页面错误</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
<source>Python3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="564"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="567"/>
<source><p>The configuration page <b>{0}</b> could not be loaded.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="263"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="266"/>
<source>Keywords</source>
<translation type="unfinished"></translation>
</message>
@@ -4140,27 +4140,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="364"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="367"/>
<source>Tray Starter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="349"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
<source>VirusTotal Interface</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="335"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="338"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="425"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="428"/>
<source>Enter filter text...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="151"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="154"/>
<source>Notifications</source>
<translation type="unfinished"></translation>
</message>
@@ -4170,12 +4170,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
<source>Code Checkers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="352"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="355"/>
<source>eric6 Web Browser</source>
<translation type="unfinished"></translation>
</message>
@@ -4184,6 +4184,11 @@
<source>Log-Viewer</source>
<translation type="unfinished">日志浏览器</translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="148"/>
+ <source>Mimetypes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Connection</name>
@@ -31448,27 +31453,27 @@
<context>
<name>LogViewerEdit</name>
<message>
- <location filename="../UI/LogView.py" line="118"/>
+ <location filename="../UI/LogView.py" line="115"/>
<source>Clear</source>
<translation type="unfinished">清除</translation>
</message>
<message>
- <location filename="../UI/LogView.py" line="119"/>
+ <location filename="../UI/LogView.py" line="116"/>
<source>Copy</source>
<translation type="unfinished">复制</translation>
</message>
<message>
- <location filename="../UI/LogView.py" line="121"/>
+ <location filename="../UI/LogView.py" line="118"/>
<source>Find</source>
<translation type="unfinished">查找</translation>
</message>
<message>
- <location filename="../UI/LogView.py" line="123"/>
+ <location filename="../UI/LogView.py" line="120"/>
<source>Select All</source>
<translation type="unfinished">全选</translation>
</message>
<message>
- <location filename="../UI/LogView.py" line="125"/>
+ <location filename="../UI/LogView.py" line="122"/>
<source>Configure...</source>
<translation type="unfinished">配置……</translation>
</message>
@@ -31521,17 +31526,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="35"/>
+ <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="32"/>
<source><b>Message Filters for Standard Output</b><p>This list shows the configured message filters used to suppress messages received via stdout.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="40"/>
+ <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="37"/>
<source><b>Message Filters for Standard Error </b><p>This list shows the configured message filters used to suppress messages received via stderr.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="45"/>
+ <location filename="../Preferences/ConfigurationPages/LogViewerPage.py" line="42"/>
<source><b>Message Filters for both</b><p>This list shows the configured message filters used to suppress messages received via stdout or stderr.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -32071,6 +32076,39 @@
</message>
</context>
<context>
+ <name>MimeTypesPage</name>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="17"/>
+ <source><b>Configure Text Mimetypes</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="60"/>
+ <source>Press to reset the list to default values</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="63"/>
+ <source>Reset to Defaults</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+ <source>Reset Mime Types</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="51"/>
+ <source>Do you really want to reset the configured list of mime types?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MimeTypesPage.ui" line="37"/>
+ <source>Files of the mime types configured below are opened in an eric editor (in addition to all 'text' mime types).</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MiniEditor</name>
<message>
<location filename="../QScintilla/MiniEditor.py" line="373"/>
@@ -35348,27 +35386,27 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1185"/>
+ <location filename="../Preferences/__init__.py" line="1289"/>
<source>Export Preferences</source>
<translation>导出首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1213"/>
+ <location filename="../Preferences/__init__.py" line="1317"/>
<source>Import Preferences</source>
<translation>导入首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1213"/>
+ <location filename="../Preferences/__init__.py" line="1317"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1315"/>
+ <location filename="../Preferences/__init__.py" line="1419"/>
<source>Select Python{0} Interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1315"/>
+ <location filename="../Preferences/__init__.py" line="1419"/>
<source>Select the Python{0} interpreter to be used:</source>
<translation type="unfinished"></translation>
</message>
