Mercurial > octave
changeset 25276:9eb3755b419b
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Apr 2018 21:47:28 -0400 |
| parents | ac6ba9f2fa41 (current diff) 4adeabc1bbfe (diff) |
| children | 607c59f16834 |
| files | libgui/src/thread-manager.cc libgui/src/thread-manager.h |
| diffstat | 11 files changed, 932 insertions(+), 1084 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/languages/fr_FR.ts Tue Apr 17 12:48:33 2018 -0700 +++ b/libgui/languages/fr_FR.ts Tue Apr 17 21:47:28 2018 -0400 @@ -449,24 +449,24 @@ <message> <location line="+16"/> <source>Find:</source> - <translation type="unfinished"></translation> + <translation>Rechercher :</translation> </message> <message> <location line="+7"/> <location line="+1"/> <source>Search forward</source> - <translation type="unfinished"></translation> + <translation>Suivant</translation> </message> <message> <location line="+5"/> <location line="+1"/> <source>Search backward</source> - <translation type="unfinished"></translation> + <translation>Précédent</translation> </message> <message> <location line="+25"/> <source>Escape</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+24"/> @@ -3078,12 +3078,12 @@ <message> <location line="+68"/> <source>Import shortcuts from file ...</source> - <translation type="unfinished"></translation> + <translation>Importer des raccourcis depuis un ficher...</translation> </message> <message> <location line="+5"/> <source>Export shortcuts into file ...</source> - <translation type="unfinished"></translation> + <translation>Exporter des raccourcis vers un fichier...</translation> </message> <message> <location line="-4"/> @@ -3190,27 +3190,27 @@ <message> <location line="+259"/> <source>Foreground</source> - <translation type="unfinished"></translation> + <translation>Premier plan</translation> </message> <message> <location line="+1"/> <source>Background</source> - <translation type="unfinished">Arrière plan</translation> + <translation>Arrière plan</translation> </message> <message> <location line="+1"/> <source>Selected Foreground</source> - <translation type="unfinished"></translation> + <translation>Premier plan sélectionné</translation> </message> <message> <location line="+1"/> <source>Selected Background</source> - <translation type="unfinished"></translation> + <translation>Arrière plan sélectionné</translation> </message> <message> <location line="+1"/> <source>Alternate Background</source> - <translation type="unfinished"></translation> + <translation>Arrière plan alterné</translation> </message> <message> <location line="+255"/>
--- a/libgui/languages/zh_CN.ts Tue Apr 17 12:48:33 2018 -0700 +++ b/libgui/languages/zh_CN.ts Tue Apr 17 21:47:28 2018 -0400 @@ -56,30 +56,30 @@ <message> <location filename="../src/settings-dialog.cc" line="+137"/> <source>Difference to the default size</source> - <translation type="unfinished">和默认大小的差别</translation> + <translation>和默认大小的差别</translation> </message> <message> <location line="+6"/> <source>Background color, pink (255, 0, 255) means default</source> - <translation type="unfinished">背景颜色，粉红色 (255, 0, 255) 代表默认值 {255, 0, 255)?}</translation> + <translation>背景颜色，粉红色 (255,0,255) 代表默认值 {255, 0, 255)?}</translation> </message> <message> <location line="+2"/> <source>b</source> <comment>short form for bold</comment> - <translation type="unfinished">b</translation> + <translation>b</translation> </message> <message> <location line="+1"/> <source>i</source> <comment>short form for italic</comment> - <translation type="unfinished">i</translation> + <translation>i</translation> </message> <message> <location line="+1"/> <source>u</source> <comment>short form for underlined</comment> - <translation type="unfinished">u</translation> + <translation>u</translation> </message> </context> <context> @@ -97,17 +97,17 @@ <message> <location line="+5"/> <source>Select All</source> - <translation type="unfinished">全选</translation> + <translation>全选</translation> </message> <message> <location line="+7"/> <source>Clear Window</source> - <translation type="unfinished">清空窗口</translation> + <translation>清空窗口</translation> </message> <message> <location filename="../qterminal/libqterminal/QTerminal.cc" line="+49"/> <source>Edit %1 at line %2</source> - <translation type="unfinished">在 %2 行编辑 %1</translation> + <translation>在 %2 行编辑 %1</translation> </message> </context> <context> @@ -123,72 +123,72 @@ <message> <location filename="../../../qsci/qscilexerbash.cpp" line="+208"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> <message> <location line="+3"/> <source>Error</source> - <translation type="unfinished">错误</translation> + <translation>错误</translation> </message> <message> <location line="+3"/> <source>Comment</source> - <translation type="unfinished">注释</translation> + <translation>注释</translation> </message> <message> <location line="+3"/> <source>Number</source> - <translation type="unfinished">数字</translation> + <translation>数字</translation> </message> <message> <location line="+3"/> <source>Keyword</source> - <translation type="unfinished">关键字</translation> + <translation>关键字</translation> </message> <message> <location line="+3"/> <source>Double-quoted string</source> - <translation type="unfinished">双引号字符串</translation> + <translation>双引号字符串</translation> </message> <message> <location line="+3"/> <source>Single-quoted string</source> - <translation type="unfinished">单引号字符串</translation> + <translation>单引号字符串</translation> </message> <message> <location line="+3"/> <source>Operator</source> - <translation type="unfinished">操作符</translation> + <translation>操作符</translation> </message> <message> <location line="+3"/> <source>Identifier</source> - <translation type="unfinished">标识符</translation> + <translation>标识符</translation> </message> <message> <location line="+3"/> <source>Scalar</source> - <translation type="unfinished">标量</translation> + <translation>标量</translation> </message> <message> <location line="+3"/> <source>Parameter expansion</source> - <translation type="unfinished">参数展开</translation> + <translation>参数展开</translation> </message> <message> <location line="+3"/> <source>Backticks</source> - <translation type="unfinished">反引号</translation> + <translation>反引号</translation> </message> <message> <location line="+3"/> <source>Here document delimiter</source> - <translation type="unfinished">此处文档分隔符</translation> + <translation>here document分隔符</translation> </message> <message> <location line="+3"/> <source>Single-quoted here document</source> - <translation type="unfinished">此处单引号文档</translation> + <translation>单引号的here document</translation> </message> </context> <context> @@ -196,42 +196,42 @@ <message> <location filename="../../../qsci/qscilexerbatch.cpp" line="+179"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> <message> <location line="+3"/> <source>Comment</source> - <translation type="unfinished">注释</translation> + <translation>注释</translation> </message> <message> <location line="+3"/> <source>Keyword</source> - <translation type="unfinished">关键字</translation> + <translation>关键字</translation> </message> <message> <location line="+3"/> <source>Label</source> - <translation type="unfinished">标签</translation> + <translation>标签</translation> </message> <message> <location line="+3"/> <source>Hide command character</source> - <translation type="unfinished">隐藏命令字符</translation> + <translation>隐藏命令字符</translation> </message> <message> <location line="+3"/> <source>External command</source> - <translation type="unfinished">外部命令</translation> + <translation>外部命令</translation> </message> <message> <location line="+3"/> <source>Variable</source> - <translation type="unfinished">变量</translation> + <translation>变量</translation> </message> <message> <location line="+3"/> <source>Operator</source> - <translation type="unfinished">操作符</translation> + <translation>操作符</translation> </message> </context> <context> @@ -239,212 +239,212 @@ <message> <location filename="../../../qsci/qscilexercpp.cpp" line="+352"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> <message> <location line="+3"/> <source>Inactive default</source> - <translation type="unfinished">不活动的默认</translation> + <translation>不活动的默认</translation> </message> <message> <location line="+3"/> <source>C comment</source> - <translation type="unfinished">C 注释</translation> + <translation>C 注释</translation> </message> <message> <location line="+3"/> <source>Inactive C comment</source> - <translation type="unfinished">不活动的 C 注释</translation> + <translation>不活动的 C 注释</translation> </message> <message> <location line="+3"/> <source>C++ comment</source> - <translation type="unfinished">C++ 注释</translation> + <translation>C++ 注释</translation> </message> <message> <location line="+3"/> <source>Inactive C++ comment</source> - <translation type="unfinished">不活动的 C++ 注释</translation> + <translation>不活动的 C++ 注释</translation> </message> <message> <location line="+3"/> <source>JavaDoc style C comment</source> - <translation type="unfinished">JavaDoc 风格的 C 注释</translation> + <translation>JavaDoc 风格的 C 注释</translation> </message> <message> <location line="+3"/> <source>Inactive JavaDoc style C comment</source> - <translation type="unfinished">不活动的 JavaDoc 风格的 C 注释</translation> + <translation>不活动的 JavaDoc 风格的 C 注释</translation> </message> <message> <location line="+3"/> <source>Number</source> - <translation type="unfinished">数字</translation> + <translation>数字</translation> </message> <message> <location line="+3"/> <source>Inactive number</source> - <translation type="unfinished">不活动的数字</translation> + <translation>不活动的数字</translation> </message> <message> <location line="+3"/> <source>Keyword</source> - <translation type="unfinished">关键字</translation> + <translation>关键字</translation> </message> <message> <location line="+3"/> <source>Inactive keyword</source> - <translation type="unfinished">不活动的关键字</translation> + <translation>不活动的关键字</translation> </message> <message> <location line="+3"/> <source>Double-quoted string</source> - <translation type="unfinished">双引号字符串</translation> + <translation>双引号字符串</translation> </message> <message> <location line="+3"/> <source>Inactive double-quoted string</source> - <translation type="unfinished">不活动的双引号字符串</translation> + <translation>不活动的双引号字符串</translation> </message> <message> <location line="+3"/> <source>Single-quoted string</source> - <translation type="unfinished">单引号字符串</translation> + <translation>单引号字符串</translation> </message> <message> <location line="+3"/> <source>Inactive single-quoted string</source> - <translation type="unfinished">不活动的单引号字符串</translation> + <translation>不活动的单引号字符串</translation> </message> <message> <location line="+3"/> <source>IDL UUID</source> - <translation type="unfinished">IDL UUID</translation> + <translation>IDL UUID</translation> </message> <message> <location line="+3"/> <source>Inactive IDL UUID</source> - <translation type="unfinished">不活动的 IDL UUID</translation> + <translation>不活动的 IDL UUID</translation> </message> <message> <location line="+3"/> <source>Pre-processor block</source> - <translation type="unfinished">预处理块</translation> + <translation>预处理块</translation> </message> <message> <location line="+3"/> <source>Inactive pre-processor block</source> - <translation type="unfinished">不活动的预处理块</translation> + <translation>不活动的预处理块</translation> </message> <message> <location line="+3"/> <source>Operator</source> - <translation type="unfinished">操作符</translation> + <translation>操作符</translation> </message> <message> <location line="+3"/> <source>Inactive operator</source> - <translation type="unfinished">不活动的操作符</translation> + <translation>不活动的操作符</translation> </message> <message> <location line="+3"/> <source>Identifier</source> - <translation type="unfinished">标识符</translation> + <translation>标识符</translation> </message> <message> <location line="+3"/> <source>Inactive identifier</source> - <translation type="unfinished">不活动的标识符</translation> + <translation>不活动的标识符</translation> </message> <message> <location line="+3"/> <source>Unclosed string</source> - <translation type="unfinished">未闭合的字符串</translation> + <translation>未闭合的字符串</translation> </message> <message> <location line="+3"/> <source>Inactive unclosed string</source> - <translation type="unfinished">不活动的未闭合字符串</translation> + <translation>不活动的未闭合字符串</translation> </message> <message> <location line="+3"/> <source>C# verbatim string</source> - <translation type="unfinished">C# verbatim string</translation> + <translation>C# verbatim string</translation> </message> <message> <location line="+3"/> <source>Inactive C# verbatim string</source> - <translation type="unfinished">不活动的 C# verbatim string</translation> + <translation>不活动的 C# verbatim string</translation> </message> <message> <location line="+3"/> <source>JavaScript regular expression</source> - <translation type="unfinished">JavaScript 正则表达式</translation> + <translation>JavaScript 正则表达式</translation> </message> <message> <location line="+3"/> <source>Inactive JavaScript regular expression</source> - <translation type="unfinished">不活动的 JavaScript 正则表达式</translation> + <translation>不活动的 JavaScript 正则表达式</translation> </message> <message> <location line="+3"/> <source>JavaDoc style C++ comment</source> - <translation type="unfinished">JavaDoc 风格 C++ 注释</translation> + <translation>JavaDoc 风格 C++ 注释</translation> </message> <message> <location line="+3"/> <source>Inactive JavaDoc style C++ comment</source> - <translation type="unfinished">不活动的 JavaDoc 风格 C++ 注释</translation> + <translation>不活动的 JavaDoc 风格 C++ 注释</translation> </message> <message> <location line="+3"/> <source>Secondary keywords and identifiers</source> - <translation type="unfinished">次要关键字和标识符</translation> + <translation>次要关键字和标识符</translation> </message> <message> <location line="+3"/> <source>Inactive secondary keywords and identifiers</source> - <translation type="unfinished">不活动的次要关键字和标识符</translation> + <translation>不活动的次要关键字和标识符</translation> </message> <message> <location line="+3"/> <source>JavaDoc keyword</source> - <translation type="unfinished">JavaDoc 关键字</translation> + <translation>JavaDoc 关键字</translation> </message> <message> <location line="+3"/> <source>Inactive JavaDoc keyword</source> - <translation type="unfinished">不活动的 JavaDoc 关键字</translation> + <translation>不活动的 JavaDoc 关键字</translation> </message> <message> <location line="+3"/> <source>JavaDoc keyword error</source> - <translation type="unfinished">JavaDoc 关键字错误</translation> + <translation>JavaDoc 关键字错误</translation> </message> <message> <location line="+3"/> <source>Inactive JavaDoc keyword error</source> - <translation type="unfinished">不活动的 JavaDoc 关键字错误</translation> + <translation>不活动的 JavaDoc 关键字错误</translation> </message> <message> <location line="+3"/> <source>Global classes and typedefs</source> - <translation type="unfinished">全局的 classes 和 typedefs</translation> + <translation>全局的 classes 和 typedefs</translation> </message> <message> <location line="+3"/> <source>Inactive global classes and typedefs</source> - <translation type="unfinished">不活动的全局 classes 和 typedefs</translation> + <translation>不活动的全局 classes 和 typedefs</translation> </message> <message> <location line="+3"/> <source>C++ raw string</source> - <translation type="unfinished">C++ raw string</translation> + <translation>C++ raw string</translation> </message> <message> <location line="+3"/> <source>Inactive C++ raw string</source> - <translation type="unfinished">不活动的 C++ raw string</translation> + <translation>不活动的 C++ raw string</translation> </message> </context> <context> @@ -452,42 +452,42 @@ <message> <location filename="../../../qsci/qscilexerdiff.cpp" line="+107"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> <message> <location line="+3"/> <source>Comment</source> - <translation type="unfinished">注释</translation> + <translation>注释</translation> </message> <message> <location line="+3"/> <source>Command</source> - <translation type="unfinished">命令</translation> + <translation>命令</translation> </message> <message> <location line="+3"/> <source>Header</source> - <translation type="unfinished">标头</translation> + <translation>标头</translation> </message> <message> <location line="+3"/> <source>Position</source> - <translation type="unfinished">位置</translation> + <translation>位置</translation> </message> <message> <location line="+3"/> <source>Removed line</source> - <translation type="unfinished">移除的行</translation> + <translation>移除的行</translation> </message> <message> <location line="+3"/> <source>Added line</source> - <translation type="unfinished">添加的行</translation> + <translation>添加的行</translation> </message> <message> <location line="+3"/> <source>Changed line</source> - <translation type="unfinished">改变的行</translation> + <translation>改变的行</translation> </message> </context> <context> @@ -495,47 +495,47 @@ <message> <location filename="../../../qsci/qscilexermatlab.cpp" line="+138"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> <message> <location line="+3"/> <source>Comment</source> - <translation type="unfinished">注释</translation> + <translation>注释</translation> </message> <message> <location line="+3"/> <source>Command</source> - <translation type="unfinished">命令</translation> + <translation>命令</translation> </message> <message> <location line="+3"/> <source>Number</source> - <translation type="unfinished">数字</translation> + <translation>数字</translation> </message> <message> <location line="+3"/> <source>Keyword</source> - <translation type="unfinished">关键字</translation> + <translation>关键字</translation> </message> <message> <location line="+3"/> <source>Single-quoted string</source> - <translation type="unfinished">单引号字符串</translation> + <translation>单引号字符串</translation> </message> <message> <location line="+3"/> <source>Operator</source> - <translation type="unfinished">操作符</translation> + <translation>操作符</translation> </message> <message> <location line="+3"/> <source>Identifier</source> - <translation type="unfinished">标识符</translation> + <translation>标识符</translation> </message> <message> <location line="+3"/> <source>Double-quoted string</source> - <translation type="unfinished">双引号字符串</translation> + <translation>双引号字符串</translation> </message> </context> <context> @@ -543,32 +543,32 @@ <message> <location filename="../../../qsci/qscilexerperl.cpp" line="+333"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> <message> <location line="+3"/> <source>Error</source> - <translation type="unfinished">错误</translation> + <translation>错误</translation> </message> <message> <location line="+3"/> <source>Comment</source> - <translation type="unfinished">注释</translation> + <translation>注释</translation> </message> <message> <location line="+3"/> <source>POD</source> - <translation type="unfinished">POD</translation> + <translation>POD</translation> </message> <message> <location line="+3"/> <source>Number</source> - <translation type="unfinished">数字</translation> + <translation>数字</translation> </message> <message> <location line="+3"/> <source>Keyword</source> - <translation type="unfinished">关键字</translation> + <translation>关键字</translation> </message> <message> <location line="+3"/> @@ -578,172 +578,172 @@ <message> <location line="+3"/> <source>Single-quoted string</source> - <translation type="unfinished">单引号字符串</translation> + <translation>单引号字符串</translation> </message> <message> <location line="+3"/> <source>Operator</source> - <translation type="unfinished">操作符</translation> + <translation>操作符</translation> </message> <message> <location line="+3"/> <source>Identifier</source> - <translation type="unfinished">标识符</translation> + <translation>标识符</translation> </message> <message> <location line="+3"/> <source>Scalar</source> - <translation type="unfinished">标量</translation> + <translation>标量</translation> </message> <message> <location line="+3"/> <source>Array</source> - <translation type="unfinished">数组</translation> + <translation>数组</translation> </message> <message> <location line="+3"/> <source>Hash</source> - <translation type="unfinished">哈希</translation> + <translation>哈希</translation> </message> <message> <location line="+3"/> <source>Symbol table</source> - <translation type="unfinished">符号表</translation> + <translation>符号表</translation> </message> <message> <location line="+3"/> <source>Regular expression</source> - <translation type="unfinished">正则表达式</translation> + <translation>正则表达式</translation> </message> <message> <location line="+3"/> <source>Substitution</source> - <translation type="unfinished">替换</translation> + <translation>替换</translation> </message> <message> <location line="+3"/> <source>Backticks</source> - <translation type="unfinished">反引号</translation> + <translation>反引号</translation> </message> <message> <location line="+3"/> <source>Data section</source> - <translation type="unfinished">数据段</translation> + <translation>数据段</translation> </message> <message> <location line="+3"/> <source>Here document delimiter</source> - <translation type="unfinished">此处文档分隔符</translation> + <translation>此处文档分隔符</translation> </message> <message> <location line="+3"/> <source>Single-quoted here document</source> - <translation type="unfinished">此处单引号文档</translation> + <translation>单引号here document</translation> </message> <message> <location line="+3"/> <source>Double-quoted here document</source> - <translation type="unfinished">此处双引号文档</translation> + <translation>双引号here document</translation> </message> <message> <location line="+3"/> <source>Backtick here document</source> - <translation type="unfinished">此处反引号文档</translation> + <translation>反引号here document</translation> </message> <message> <location line="+3"/> <source>Quoted string (q)</source> - <translation type="unfinished">引用的字符串 (q)</translation> + <translation>引用的字符串 (q)</translation> </message> <message> <location line="+3"/> <source>Quoted string (qq)</source> - <translation type="unfinished">引用的字符串 (qq)</translation> + <translation>引用的字符串 (qq)</translation> </message> <message> <location line="+3"/> <source>Quoted string (qx)</source> - <translation type="unfinished">引用的字符串 (qx)</translation> + <translation>引用的字符串 (qx)</translation> </message> <message> <location line="+3"/> <source>Quoted string (qr)</source> - <translation type="unfinished">引用的字符串 (qr)</translation> + <translation>引用的字符串 (qr)</translation> </message> <message> <location line="+3"/> <source>Quoted string (qw)</source> - <translation type="unfinished">引用的字符串 (qw)</translation> + <translation>引用的字符串 (qw)</translation> </message> <message> <location line="+3"/> <source>POD verbatim</source> - <translation type="unfinished">POD verbatim</translation> + <translation>POD verbatim</translation> </message> <message> <location line="+3"/> <source>Subroutine prototype</source> - <translation type="unfinished">子程序原型</translation> + <translation>子程序原型</translation> </message> <message> <location line="+3"/> <source>Format identifier</source> - <translation type="unfinished">格式标识符</translation> + <translation>格式标识符</translation> </message> <message> <location line="+3"/> <source>Format body</source> - <translation type="unfinished">格式正文</translation> + <translation>格式正文</translation> </message> <message> <location line="+3"/> <source>Double-quoted string (interpolated variable)</source> - <translation type="unfinished">双引号字符串 (插值的变量)</translation> + <translation>双引号字符串 (插值的变量)</translation> </message> <message> <location line="+3"/> <source>Translation</source> - <translation type="unfinished">翻译</translation> + <translation>翻译</translation> </message> <message> <location line="+3"/> <source>Regular expression (interpolated variable)</source> - <translation type="unfinished">正则表达式 (插值的变量)</translation> + <translation>正则表达式 (插值的变量)</translation> </message> <message> <location line="+3"/> <source>Substitution (interpolated variable)</source> - <translation type="unfinished">替换 (插值的变量)</translation> + <translation>替换 (插值的变量)</translation> </message> <message> <location line="+3"/> <source>Backticks (interpolated variable)</source> - <translation type="unfinished">反引号 (插值的变量)</translation> + <translation>反引号 (插值的变量)</translation> </message> <message> <location line="+3"/> <source>Double-quoted here document (interpolated variable)</source> - <translation type="unfinished">此处双引号文档 (插值的变量)</translation> + <translation>此处双引号文档 (插值的变量)</translation> </message> <message> <location line="+3"/> <source>Backtick here document (interpolated variable)</source> - <translation type="unfinished">此处反引号文档 (插值的变量)</translation> + <translation>此处反引号文档 (插值的变量)</translation> </message> <message> <location line="+3"/> <source>Quoted string (qq, interpolated variable)</source> - <translation type="unfinished">引用的字符串 (qq, 插值的变量)</translation> + <translation>引用的字符串 (qq, 插值的变量)</translation> </message> <message> <location line="+3"/> <source>Quoted string (qx, interpolated variable)</source> - <translation type="unfinished">引用的字符串 (qx, 插值的变量)</translation> + <translation>引用的字符串 (qx, 插值的变量)</translation> </message> <message> <location line="+3"/> <source>Quoted string (qr, interpolated variable)</source> - <translation type="unfinished">引用的字符串 (qr, 插值的变量)</translation> + <translation>引用的字符串 (qr, 插值的变量)</translation> </message> </context> <context> @@ -751,37 +751,37 @@ <message> <location filename="../../../qsci/qsciscintilla.cpp" line="+4201"/> <source>&Undo</source> - <translation type="unfinished">撤销 (&U) </translation> + <translation>撤销 (&U)</translation> </message> <message> <location line="+4"/> <source>&Redo</source> - <translation type="unfinished">重做 (&R)</translation> + <translation>重做 (&R)</translation> </message> <message> <location line="+6"/> <source>Cu&t</source> - <translation type="unfinished">剪切 (&T)</translation> + <translation>剪切 (&T)</translation> </message> <message> <location line="+5"/> <source>&Copy</source> - <translation type="unfinished">复制 (&C)</translation> + <translation>复制 (&C)</translation> </message> <message> <location line="+6"/> <source>&Paste</source> - <translation type="unfinished">粘贴</translation> + <translation>粘贴 (&P)</translation> </message> <message> <location line="+4"/> <source>Delete</source> - <translation type="unfinished">删除</translation> + <translation>删除</translation> </message> <message> <location line="+7"/> <source>Select All</source> - <translation type="unfinished">全选</translation> + <translation>全选</translation> </message> </context> <context> @@ -789,74 +789,74 @@ <message> <location filename="../graphics/Figure.cc" line="+299"/> <source>Figure ToolBar</source> - <translation type="unfinished">图表工具栏</translation> + <translation>图表工具栏</translation> </message> <message> <location line="+9"/> <source>Axes</source> - <translation type="unfinished">轴</translation> + <translation>轴</translation> </message> <message> <location line="+4"/> <source>Grid</source> - <translation type="unfinished">网格</translation> + <translation>网格</translation> </message> <message> <location line="+4"/> <source>Autoscale</source> - <translation type="unfinished">自动缩放</translation> + <translation>自动缩放</translation> </message> <message> <location line="+7"/> <source>&File</source> - <translation type="unfinished">文件 (&F)</translation> + <translation>文件 (&F)</translation> </message> <message> <location line="+2"/> <source>&Save</source> - <translation type="unfinished">保存 (&S)</translation> + <translation>保存 (&S)</translation> </message> <message> <location line="+1"/> <source>Save &As</source> - <translation type="unfinished">另存为 (&A)</translation> + <translation>另存为 (&A)</translation> </message> <message> <location line="+2"/> <source>&Close Figure</source> - <translation type="unfinished">关闭图表 (&C)</translation> + <translation>关闭图表 (&C)</translation> </message> <message> <location line="+3"/> <source>&Edit</source> - <translation type="unfinished">编辑 (&E)</translation> + <translation>编辑 (&E)</translation> </message> <message> <location line="+2"/> <source>Cop&y</source> - <translation type="unfinished">复制 (&y)</translation> + <translation>复制 (&y)</translation> </message> <message> <location line="+7"/> <location line="+533"/> <source>About Octave</source> - <translation type="unfinished">关于 Octave</translation> + <translation>关于 Octave</translation> </message> <message> <location line="+41"/> <source>Octave Figure File (*.ofig);;Vector Image Formats (*.eps *.epsc *.pdf *.svg *.ps *.tikz);;Bitmap Image Formats (*.gif *.jpg *.png *.tiff)</source> - <translation type="unfinished"></translation> + <translation>Octave 图表文件 (*.ofig);;矢量图形格式 (*.eps *.epsc *.pdf *.svg *.ps *.tikz);;位图格式 (*.gif *.jpg *.png *.tiff)</translation> </message> <message> <location line="-576"/> <source>&Help</source> - <translation type="unfinished">帮助 (&H)</translation> + <translation>帮助 (&H)</translation> </message> <message> <location line="+574"/> <location line="+76"/> <source>Save Figure As</source> - <translation type="unfinished">另存图表为</translation> + <translation>另存图表为</translation> </message> </context> <context> @@ -864,32 +864,32 @@ <message> <location filename="../graphics/MouseModeActionGroup.cc" line="+40"/> <source>Rotate</source> - <translation type="unfinished">旋转</translation> + <translation>旋转</translation> </message> <message> <location line="+2"/> <source>Zoom In</source> - <translation type="unfinished">放大</translation> + <translation>放大</translation> </message> <message> <location line="+4"/> <source>Zoom Out</source> - <translation type="unfinished">缩小</translation> + <translation>缩小</translation> </message> <message> <location line="+4"/> <source>Pan</source> - <translation type="unfinished">拖动</translation> + <translation>拖动</translation> </message> <message> <location line="+2"/> <source>Insert Text</source> - <translation type="unfinished">插入文本</translation> + <translation>插入文本</translation> </message> <message> <location line="+2"/> <source>Select</source> - <translation type="unfinished">选择</translation> + <translation>选择</translation> </message> </context> <context> @@ -897,28 +897,28 @@ <message> <location filename="../qterminal/libqterminal/unix/Filter.cpp" line="+628"/> <source>Open Link</source> - <translation type="unfinished"></translation> + <translation>打开链接</translation> </message> <message> <location line="+1"/> <source>Copy Link Address</source> - <translation type="unfinished"></translation> + <translation>复制链接地址</translation> </message> <message> <location line="+4"/> <source>Send Email To...</source> - <translation type="unfinished"></translation> + <translation>发送电子邮件给...</translation> </message> <message> <location line="+1"/> <source>Copy Email Address</source> - <translation type="unfinished"></translation> + <translation>复制电子邮箱地址</translation> </message> <message> <location line="+10"/> <location line="+12"/> <source>Edit %1 at line %2</source> - <translation type="unfinished">在 %2 行编辑 %1</translation> + <translation>在 %2 行编辑 %1</translation> </message> </context> <context> @@ -926,153 +926,153 @@ <message> <location filename="../graphics/annotation-dialog.ui" line="+17"/> <source>Annotation</source> - <translation type="unfinished">注释</translation> + <translation>注释</translation> </message> <message> <location line="+6"/> <source>Text</source> - <translation type="unfinished">文本</translation> + <translation>文本</translation> </message> <message> <location line="+6"/> <source>String</source> - <translation type="unfinished">字符串</translation> + <translation>字符串</translation> </message> <message> <location line="+13"/> <source>Font</source> - <translation type="unfinished">字体</translation> + <translation>字体</translation> </message> <message> <location line="+42"/> <source>bold</source> - <translation type="unfinished">粗体</translation> + <translation>粗体</translation> </message> <message> <location line="+3"/> <source>b</source> - <translation type="unfinished">b</translation> + <translation>b</translation> </message> <message> <location line="+13"/> <source>italic</source> - <translation type="unfinished">斜体</translation> + <translation>斜体</translation> </message> <message> <location line="+3"/> <source>i</source> - <translation type="unfinished">i</translation> + <translation>i</translation> </message> <message> <location line="+428"/> <source>color</source> - <translation type="unfinished">颜色</translation> + <translation>颜色</translation> </message> <message> <location line="+22"/> <source>Horz alignment</source> - <translation type="unfinished">水平对齐</translation> + <translation>水平对齐</translation> </message> <message> <location line="+11"/> <source>left</source> - <translation type="unfinished">左</translation> + <translation>左</translation> </message> <message> <location line="+5"/> <location line="+29"/> <source>middle</source> - <translation type="unfinished">中</translation> + <translation>中</translation> </message> <message> <location line="-24"/> <source>right</source> - <translation type="unfinished">右</translation> + <translation>右</translation> </message> <message> <location line="+8"/> <source>Vert alignment</source> - <translation type="unfinished">垂直对齐</translation> + <translation>垂直对齐</translation> </message> <message> <location line="+11"/> <source>top</source> - <translation type="unfinished">上</translation> + <translation>上</translation> </message> <message> <location line="+10"/> <source>bottom</source> - <translation type="unfinished">下</translation> + <translation>下</translation> </message> <message> <location line="+11"/> <source>Position</source> - <translation type="unfinished">位置</translation> + <translation>位置</translation> </message> <message> <location line="+6"/> <source>X</source> - <translation type="unfinished">X</translation> + <translation>X</translation> </message> <message> <location line="+20"/> <source>Y</source> - <translation type="unfinished">Y</translation> + <translation>Y</translation> </message> <message> <location line="+20"/> <source>Width</source> - <translation type="unfinished">宽</translation> + <translation>宽</translation> </message> <message> <location line="+17"/> <source>Height</source> - <translation type="unfinished">高</translation> + <translation>高</translation> </message> <message> <location line="+17"/> <source>units</source> - <translation type="unfinished">单位</translation> + <translation>单位</translation> </message> <message> <location line="+11"/> <source>normalized</source> - <translation type="unfinished">归一化</translation> + <translation>归一化</translation> </message> <message> <location line="+8"/> <source>Fit to box</source> - <translation type="unfinished">适应方框大小</translation> + <translation>适应方框大小</translation> </message> <message> <location line="+13"/> <source>Box</source> - <translation type="unfinished">方框</translation> + <translation>方框</translation> </message> <message> <location line="+6"/> <source>Background</source> - <translation type="unfinished">背景</translation> + <translation>背景</translation> </message> <message> <location line="+444"/> <source>Edge</source> - <translation type="unfinished">边</translation> + <translation>边</translation> </message> <message> <location line="+133"/> <source>Line style</source> - <translation type="unfinished">线条样式</translation> + <translation>线条样式</translation> </message> <message> <location line="+11"/> <source>none</source> - <translation type="unfinished">无</translation> + <translation>无</translation> </message> <message> <location line="+8"/> <source>Line width</source> - <translation type="unfinished">线条宽度</translation> + <translation>线条宽度</translation> </message> </context> <context> @@ -1080,7 +1080,7 @@ <message> <location filename="../src/dialog.cc" line="+276"/> <source>Select All</source> - <translation type="unfinished">全选</translation> + <translation>全选</translation> </message> </context> <context> @@ -1090,69 +1090,72 @@ <location line="+10"/> <location line="+317"/> <source>Octave Documentation</source> - <translation type="unfinished"></translation> + <translation>Octave文档</translation> </message> <message> <location line="-326"/> <source>Could not copy help collection to temporary file. Search capabilities may be affected. %1</source> - <translation type="unfinished"></translation> + <translation>无法将帮助内容写入临时文件。 +搜索能力可能会受到影响。 +%1</translation> </message> <message> <location line="+10"/> <source>Could not setup the data required for the documentation viewer. Only help texts in the Console Widget will be available.</source> - <translation type="unfinished"></translation> + <translation>文档查看器无法获取启动数据。 +仅控制台组件的帮助文本可以查看。</translation> </message> <message> <location line="+16"/> <source>Find:</source> - <translation type="unfinished"></translation> + <translation>查找:</translation> </message> <message> <location line="+7"/> <location line="+1"/> <source>Search forward</source> - <translation type="unfinished"></translation> + <translation>向前搜索</translation> </message> <message> <location line="+5"/> <location line="+1"/> <source>Search backward</source> - <translation type="unfinished"></translation> + <translation>向后搜索</translation> </message> <message> <location line="+25"/> <source>Escape</source> - <translation type="unfinished"></translation> + <translation>转义</translation> </message> <message> <location line="+24"/> <source>Contents</source> - <translation type="unfinished"></translation> + <translation>内容</translation> </message> <message> <location line="+10"/> <source>Enter text to search the indices</source> - <translation type="unfinished"></translation> + <translation>输入文本搜索目录</translation> </message> <message> <location line="+10"/> <location line="+37"/> <source>Search</source> - <translation type="unfinished"></translation> + <translation>搜索</translation> </message> <message> <location line="-22"/> <source>Index</source> - <translation type="unfinished"></translation> + <translation>目录</translation> </message> <message> <location line="+203"/> <source>Unable to register help file %1.</source> - <translation type="unfinished"></translation> + <translation>无法注册帮助文件 %1.</translation> </message> </context> <context> @@ -1160,12 +1163,12 @@ <message> <location filename="../src/documentation-dock-widget.cc" line="+39"/> <source>Documentation</source> - <translation type="unfinished">文档</translation> + <translation>文档</translation> </message> <message> <location line="+1"/> <source>See the documentation for help.</source> - <translation type="unfinished">阅读文档以获取帮助。</translation> + <translation>阅读文档以获取帮助。</translation> </message> </context> <context> @@ -1174,20 +1177,20 @@ <location filename="../src/external-editor-interface.cc" line="+63"/> <location line="+45"/> <source>Octave Editor</source> - <translation type="unfinished">Octave 编辑器</translation> + <translation>Octave 编辑器</translation> </message> <message> <location line="-44"/> <source>Could not start custom file editor %1</source> - <translation type="unfinished">无法启动自定义文件编辑器 + <translation>无法启动自定义文件编辑器 %1</translation> </message> <message> <location line="+45"/> <source>There is no custom editor configured yet. Do you want to open the preferences?</source> - <translation type="unfinished"></translation> + <translation>自定义文本编辑器尚未配置。是否打开首选项？</translation> </message> </context> <context> @@ -1199,28 +1202,28 @@ <location line="+19"/> <location line="+25"/> <source>Octave Editor</source> - <translation type="unfinished">Octave 编辑器</translation> + <translation>Octave 编辑器</translation> </message> <message> <location line="-487"/> <source>File not saved! A file with the selected name %1 is already open in the editor</source> - <translation type="unfinished">文件未保存！一个带有相同名称 + <translation>文件未保存！一个带有相同名称 %1 的文件在编辑器中被打开</translation> </message> <message> <location line="+28"/> <source>The associated file editor tab has disappeared.</source> - <translation type="unfinished">关联文件的编辑标签消失了。</translation> + <translation>关联文件的编辑标签消失了。</translation> </message> <message> <location line="+416"/> <source>Could not open file %1 for read: %2.</source> - <translation type="unfinished">数据文件 + <translation>数据文件 %1 无法打开/读取: %2.</translation> </message> @@ -1229,396 +1232,398 @@ <source>File %1 does not exist. Do you want to create it?</source> - <translation type="unfinished"></translation> + <translation>文件 +%1 +不存在。你希望创建它吗？</translation> </message> <message> <location line="+4"/> <source>Create</source> - <translation type="unfinished">创建</translation> + <translation>创建</translation> </message> <message> <location line="+1"/> <source>Cancel</source> - <translation type="unfinished">取消</translation> + <translation>取消</translation> </message> <message> <location line="+20"/> <source>Could not open file %1 for write: %2.</source> - <translation type="unfinished">数据文件 + <translation>数据文件 %1 无法打开/写入: %2.</translation> </message> <message> <location line="+217"/> <source>&File</source> - <translation type="unfinished">文件 (&F)</translation> + <translation>文件 (&F)</translation> </message> <message> <location line="+3"/> <source>&Recent Editor Files</source> - <translation type="unfinished">最近编辑器文件 (&R)</translation> + <translation>最近编辑器文件 (&R)</translation> </message> <message> <location line="+9"/> <source>&Edit Function</source> - <translation type="unfinished">编辑函数 (&E)</translation> + <translation>编辑函数 (&E)</translation> </message> <message> <location line="+8"/> <source>&Save File</source> - <translation type="unfinished">保存文件 (&S)</translation> + <translation>保存文件 (&S)</translation> </message> <message> <location line="+6"/> <source>Save File &As...</source> - <translation type="unfinished">文件另存为 (&A)...</translation> + <translation>文件另存为 (&A)...</translation> </message> <message> <location line="+8"/> <source>&Close</source> - <translation type="unfinished">关闭 (&C)</translation> + <translation>关闭 (&C)</translation> </message> <message> <location line="+6"/> <source>Close All</source> - <translation type="unfinished">关闭全部</translation> + <translation>关闭全部</translation> </message> <message> <location line="+6"/> <source>Close Other Files</source> - <translation type="unfinished">关闭其他文件</translation> + <translation>关闭其他文件</translation> </message> <message> <location line="+8"/> <source>Print...</source> - <translation type="unfinished">打印...</translation> + <translation>打印...</translation> </message> <message> <location line="+5"/> <source>&Edit</source> - <translation type="unfinished">编辑 (&E)</translation> + <translation>编辑 (&E)</translation> </message> <message> <location line="+5"/> <source>&Redo</source> - <translation type="unfinished">重做 (&R)</translation> + <translation>重做 (&R)</translation> </message> <message> <location line="+9"/> <source>Cu&t</source> - <translation type="unfinished">剪切 (&T)</translation> + <translation>剪切 (&T)</translation> </message> <message> <location line="+7"/> <source>&Find and Replace...</source> - <translation type="unfinished">查找并替换 (&F) ...</translation> + <translation>查找并替换 (&F) ...</translation> </message> <message> <location line="+5"/> <source>Find &Next...</source> - <translation type="unfinished">下一个匹配 (&N)</translation> + <translation>下一个匹配 (&N)...</translation> </message> <message> <location line="+5"/> <source>Find &Previous...</source> - <translation type="unfinished">上一个匹配 (&P)</translation> + <translation>上一个匹配 (&P)...</translation> </message> <message> <location line="+5"/> <source>&Commands</source> - <translation type="unfinished">命令 (&C)</translation> + <translation>命令 (&C)</translation> </message> <message> <location line="+4"/> <source>Delete Line</source> - <translation type="unfinished">删除行</translation> + <translation>删除行</translation> </message> <message> <location line="+5"/> <source>Copy Line</source> - <translation type="unfinished">复制行</translation> + <translation>复制行</translation> </message> <message> <location line="+5"/> <source>Cut Line</source> - <translation type="unfinished">剪切行</translation> + <translation>剪切行</translation> </message> <message> <location line="+7"/> <source>Delete to Start of Word</source> - <translation type="unfinished"></translation> + <translation>删除到单词起始处</translation> </message> <message> <location line="+5"/> <source>Delete to End of Word</source> - <translation type="unfinished"></translation> + <translation>删除到单词结尾处</translation> </message> <message> <location line="+5"/> <source>Delete to Start of Line</source> - <translation type="unfinished"></translation> + <translation>删除到一行开头</translation> </message> <message> <location line="+5"/> <source>Delete to End of Line</source> - <translation type="unfinished"></translation> + <translation>删除到一行结尾</translation> </message> <message> <location line="+7"/> <source>Duplicate Selection/Line</source> - <translation type="unfinished"></translation> + <translation>重复选择/行</translation> </message> <message> <location line="+5"/> <source>Transpose Line</source> - <translation type="unfinished">交换行</translation> + <translation>交换行</translation> </message> <message> <location line="+7"/> <source>&Show Completion List</source> - <translation type="unfinished">显示完成列表</translation> + <translation>显示完成列表(&S)</translation> </message> <message> <location line="+3"/> <source>&Format</source> - <translation type="unfinished">格式</translation> + <translation>格式(&F)</translation> </message> <message> <location line="+4"/> <source>&Uppercase Selection</source> - <translation type="unfinished">选择文本转大写 (&U)</translation> + <translation>所选文本转大写 (&U)</translation> </message> <message> <location line="+5"/> <source>&Lowercase Selection</source> - <translation type="unfinished">选择文本转小写 (&L)</translation> + <translation>所选文本转小写 (&L)</translation> </message> <message> <location line="+7"/> <source>&Comment</source> - <translation type="unfinished">注释 (&C)</translation> + <translation>注释 (&C)</translation> </message> <message> <location line="+5"/> <source>&Uncomment</source> - <translation type="unfinished">取消注释 (&U)</translation> + <translation>取消注释 (&U)</translation> </message> <message> <location line="+5"/> <source>Comment (Choosing String)</source> - <translation type="unfinished"></translation> + <translation>注释(正在选择字符串)</translation> </message> <message> <location line="+7"/> <source>&Indent Selection Rigidly</source> - <translation type="unfinished"></translation> + <translation>向右严格缩进所选文本 (&I)</translation> </message> <message> <location line="+5"/> <source>&Unindent Selection Rigidly</source> - <translation type="unfinished"></translation> + <translation>向左严格缩进所选文本 (&U)</translation> </message> <message> <location line="+5"/> <source>Indent Code</source> - <translation type="unfinished"></translation> + <translation>缩进代码</translation> </message> <message> <location line="+7"/> <source>Convert Line Endings to &Windows (CRLF)</source> - <translation type="unfinished">将行尾转为 &Windows 风格 (CRLF)</translation> + <translation>将行尾转为 &Windows 风格 (CRLF)</translation> </message> <message> <location line="+5"/> <source>Convert Line Endings to &Unix (LF)</source> - <translation type="unfinished">将行尾转为 &Unix 风格 (LF)</translation> + <translation>将行尾转为 &Unix 风格 (LF)</translation> </message> <message> <location line="+5"/> <source>Convert Line Endings to &Mac (CR)</source> - <translation type="unfinished">将行尾转为 &Mac 风格 (CR)</translation> + <translation>将行尾转为 &Mac 风格 (CR)</translation> </message> <message> <location line="+3"/> <source>Navi&gation</source> - <translation type="unfinished">转到 (&g)</translation> + <translation>转到 (&g)</translation> </message> <message> <location line="+4"/> <source>Go &to Line...</source> - <translation type="unfinished">跳至行 (&T) ...</translation> + <translation>跳至行 (&T) ...</translation> </message> <message> <location line="+7"/> <source>Move to Matching Brace</source> - <translation type="unfinished">移至匹配的括号</translation> + <translation>移至匹配的括号</translation> </message> <message> <location line="+5"/> <source>Select to Matching Brace</source> - <translation type="unfinished"></translation> + <translation>选择匹配的括号间的内容</translation> </message> <message> <location line="+7"/> <source>&Next Bookmark</source> - <translation type="unfinished">下一个书签 (&N)</translation> + <translation>下一个书签 (&N)</translation> </message> <message> <location line="+5"/> <source>Pre&vious Bookmark</source> - <translation type="unfinished">上一个书签 (&V)</translation> + <translation>上一个书签 (&V)</translation> </message> <message> <location line="+5"/> <source>Toggle &Bookmark</source> - <translation type="unfinished">打开/关闭书签 (&B)</translation> + <translation>打开/关闭书签 (&B)</translation> </message> <message> <location line="+5"/> <source>&Remove All Bookmarks</source> - <translation type="unfinished">移除所有书签 (&R)</translation> + <translation>移除所有书签 (&R)</translation> </message> <message> <location line="+8"/> <source>&Preferences...</source> - <translation type="unfinished">首选项 (&P) ...</translation> + <translation>首选项 (&P) ...</translation> </message> <message> <location line="+5"/> <source>&Styles Preferences...</source> - <translation type="unfinished">风格首选项 (&S) ...</translation> + <translation>样式首选项 (&S) ...</translation> </message> <message> <location line="+5"/> <source>&View</source> - <translation type="unfinished">视图 (&V)</translation> + <translation>视图 (&V)</translation> </message> <message> <location line="+2"/> <source>&Editor</source> - <translation type="unfinished">编辑器 (&E)</translation> + <translation>编辑器 (&E)</translation> </message> <message> <location line="+4"/> <source>Show &Line Numbers</source> - <translation type="unfinished">显示行数 (&L)</translation> + <translation>显示行数 (&L)</translation> </message> <message> <location line="+6"/> <source>Show &Whitespace Characters</source> - <translation type="unfinished">显示空白字符 (&W)</translation> + <translation>显示空白字符 (&W)</translation> </message> <message> <location line="+6"/> <source>Show Line &Endings</source> - <translation type="unfinished">显示行尾 (&E)</translation> + <translation>显示行尾 (&E)</translation> </message> <message> <location line="+6"/> <source>Show &Indentation Guides</source> - <translation type="unfinished">显示缩进对齐线 (&I)</translation> + <translation>显示缩进对齐线 (&I)</translation> </message> <message> <location line="+6"/> <source>Show Long Line &Marker</source> - <translation type="unfinished">显示长线标记 (&M)</translation> + <translation>显示长线标记 (&M)</translation> </message> <message> <location line="+8"/> <source>Show &Toolbar</source> - <translation type="unfinished">显示工具栏 (&T)</translation> + <translation>显示工具栏 (&T)</translation> </message> <message> <location line="+6"/> <source>Show &Statusbar</source> - <translation type="unfinished">显示状态栏 (&S)</translation> + <translation>显示状态栏 (&S)</translation> </message> <message> <location line="+6"/> <source>Show &Horizontal Scrollbar</source> - <translation type="unfinished">显示垂直滚动条 (&H)</translation> + <translation>显示垂直滚动条 (&H)</translation> </message> <message> <location line="+8"/> <source>Zoom &In</source> - <translation type="unfinished">放大 (&I)</translation> + <translation>放大 (&I)</translation> </message> <message> <location line="+5"/> <source>Zoom &Out</source> - <translation type="unfinished">缩小 (&O)</translation> + <translation>缩小 (&O)</translation> </message> <message> <location line="+5"/> <source>&Normal Size</source> - <translation type="unfinished">正常大小 (&N)</translation> + <translation>正常大小 (&N)</translation> </message> <message> <location line="+7"/> <source>&Debug</source> - <translation type="unfinished">调试 (&D)</translation> + <translation>调试 (&D)</translation> </message> <message> <location line="+5"/> <source>Toggle &Breakpoint</source> - <translation type="unfinished">打开/关闭断点 (&B)</translation> + <translation>打开/关闭断点 (&B)</translation> </message> <message> <location line="+6"/> <source>&Next Breakpoint</source> - <translation type="unfinished">下一个断点 (&N)</translation> + <translation>下一个断点 (&N)</translation> </message> <message> <location line="+6"/> <source>Pre&vious Breakpoint</source> - <translation type="unfinished">上一个断点 (&V)</translation> + <translation>上一个断点 (&V)</translation> </message> <message> <location line="+6"/> <source>&Remove All Breakpoints</source> - <translation type="unfinished">移除所有断点 (&R)</translation> + <translation>移除所有断点 (&R)</translation> </message> <message> <location line="+9"/> <source>&Run</source> - <translation type="unfinished">运行 (&R)</translation> + <translation>运行 (&R)</translation> </message> <message> <location line="+5"/> <source>Save File and Run</source> - <translation type="unfinished">保存文件并运行</translation> + <translation>保存文件并运行</translation> </message> <message> <location line="+5"/> <source>Run &Selection</source> - <translation type="unfinished">运行选定部分 (&S)</translation> + <translation>运行选定部分 (&S)</translation> </message> <message> <location line="+6"/> <source>&Help</source> - <translation type="unfinished">帮助 (&H)</translation> + <translation>帮助 (&H)</translation> </message> <message> <location line="+4"/> <source>&Help on Keyword</source> - <translation type="unfinished">帮助关键字 (&H)</translation> + <translation>关键字的帮助 (&H)</translation> </message> <message> <location line="+5"/> <source>&Documentation on Keyword</source> - <translation type="unfinished">文档关键字 (&D)</translation> + <translation>关键字的文档 (&D)</translation> </message> <message> <location line="+25"/> <source>Recent Files</source> - <translation type="unfinished">最近文件</translation> + <translation>最近文件</translation> </message> <message> <location line="+65"/> <source>Editor</source> - <translation type="unfinished"> 编辑器</translation> + <translation>编辑器</translation> </message> </context> <context> @@ -1626,27 +1631,27 @@ <message> <location filename="../src/m-editor/file-editor-tab.cc" line="+140"/> <source>line:</source> - <translation type="unfinished">行数:</translation> + <translation>行数:</translation> </message> <message> <location line="+3"/> <source>col:</source> - <translation type="unfinished">列数:</translation> + <translation>列数:</translation> </message> <message> <location line="+7"/> <source>encoding:</source> - <translation type="unfinished">编码:</translation> + <translation>编码:</translation> </message> <message> <location line="+7"/> <source>eol:</source> - <translation type="unfinished">行尾:</translation> + <translation>行尾:</translation> </message> <message> <location line="+231"/> <source>Breakpoint condition</source> - <translation type="unfinished">条件断点</translation> + <translation>条件断点</translation> </message> <message> <location line="+91"/> @@ -1658,45 +1663,47 @@ <location line="+85"/> <location line="+36"/> <source>Octave Editor</source> - <translation type="unfinished">Octave 编辑器</translation> + <translation>Octave 编辑器</translation> </message> <message> <location line="-1897"/> <source>Cannot add breakpoint to modified file. Save and add breakpoint, or cancel?</source> - <translation type="unfinished"></translation> + <translation>无法在已修改的文件中添加断点， +保存并添加断点或者取消?</translation> </message> <message> <location line="+837"/> <source>Goto line</source> - <translation type="unfinished">前往行</translation> + <translation>前往行</translation> </message> <message> <location line="+1"/> <source>Line number</source> - <translation type="unfinished">行数</translation> + <translation>行数</translation> </message> <message> <location line="+126"/> <source>Comment selected text</source> - <translation type="unfinished"></translation> + <translation>注释所选文本</translation> </message> <message> <location line="+1"/> <source>Comment string to use: </source> - <translation type="unfinished"></translation> + <translation>注释字符串以使用: +</translation> </message> <message> <location line="+135"/> <location line="+60"/> <source><unnamed></source> - <translation type="unfinished"><未命名></translation> + <translation><未命名></translation> </message> <message> <location line="-6"/> <source>Do you want to cancel closing, save or discard the changes?</source> - <translation type="unfinished">你希望关闭，保存还是丢弃更改？</translation> + <translation>你希望关闭，保存还是丢弃更改？</translation> </message> <message> <location line="+10"/> @@ -1705,7 +1712,7 @@ %1 is about to be closed but has been modified. %2</source> - <translation type="unfinished">文件 + <translation>文件 %1 @@ -1714,41 +1721,41 @@ <message> <location line="+295"/> <source>Debug or Save</source> - <translation type="unfinished">调试或保存</translation> + <translation>调试或保存</translation> </message> <message> <location line="+1"/> <source>This file is currently being executed. Quit debugging and save?</source> - <translation type="unfinished">此文件正在运行， -是否推出调试并保存?</translation> + <translation>此文件正在运行， +是否退出调试并保存?</translation> </message> <message> <location line="+75"/> <source>Could not open file %1 for write: %2.</source> - <translation type="unfinished">无法打开文件 %1 以写入: + <translation>无法打开文件 %1 以写入: %2.</translation> </message> <message> <location line="+92"/> <source>Line Endings:</source> - <translation type="unfinished">行尾:</translation> + <translation>行尾:</translation> </message> <message> <location line="+9"/> <source>File Encoding:</source> - <translation type="unfinished">文件编码:</translation> + <translation>文件编码:</translation> </message> <message> <location line="+28"/> <source>Octave Files (*.m)</source> - <translation type="unfinished">Octave 文件 (*.m)</translation> + <translation>Octave 文件 (*.m)</translation> </message> <message> <location line="+1"/> <source>All Files (*)</source> - <translation type="unfinished">所有文件 (*)</translation> + <translation>所有文件 (*)</translation> </message> <message> <location line="+81"/> @@ -1759,7 +1766,7 @@ call your script using its name as an Octave command. Do you want to choose another name?</source> - <translation type="unfinished">"%1" + <translation>"%1" 不是有效的标识符。 如果使用此文件名，您将无法将这个名字当作 Octave 命令来调用。 @@ -1772,7 +1779,9 @@ can not be applied. Please select another one or cancel saving!</source> - <translation type="unfinished"></translation> + <translation>当前编码器 %1 无法使用 + +选择其他的编解码器或取消保存!</translation> </message> <message> <location line="+11"/> @@ -1781,19 +1790,22 @@ Using it will result in data loss! Do you want to choose another encoding?</source> - <translation type="unfinished"></translation> + <translation>当前编辑器内容无法用所选的编码 %1 进行编码。 +继续使用会造成数据丢失！ + +是否选择另一个编码？</translation> </message> <message> <location line="+85"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> - <translation type="unfinished">看起来 '%1' 已经被其他应用修改。你希望重新载入这个文件吗？</translation> + <translation>看起来 '%1' 已经被其他应用修改。你希望重新载入这个文件吗？</translation> </message> <message> <location line="+29"/> <source> Warning: The contents in the editor is modified!</source> - <translation type="unfinished"> + <translation> 警告: 编辑器中内容已经被修改！</translation> </message> @@ -1802,7 +1814,7 @@ <source>It seems that the file %1 has been deleted or renamed. Do you want to save it now?%2</source> - <translation type="unfinished">数据文件 + <translation>数据文件 %1 已经被修改或重命名。你希望现在保存这个文件吗？%2</translation> </message> @@ -1812,228 +1824,228 @@ <message> <location filename="../src/files-dock-widget.cc" line="+73"/> <source>File Browser</source> - <translation type="unfinished">文件浏览器</translation> + <translation>文件浏览器</translation> </message> <message> <location line="+1"/> <source>Browse your files</source> - <translation type="unfinished">浏览文件</translation> + <translation>浏览文件</translation> </message> <message> <location line="+5"/> <source>File size</source> - <translation type="unfinished">文件大小</translation> + <translation>文件大小</translation> </message> <message> <location line="+1"/> <source>File type</source> - <translation type="unfinished">文件类型</translation> + <translation>文件类型</translation> </message> <message> <location line="+1"/> <source>Date modified</source> - <translation type="unfinished">修改日期</translation> + <translation>修改日期</translation> </message> <message> <location line="+1"/> <source>Show hidden</source> - <translation type="unfinished">显示隐藏文件</translation> + <translation>显示隐藏文件</translation> </message> <message> <location line="+1"/> <source>Alternating row colors</source> - <translation type="unfinished">备选列颜色</translation> + <translation>备选列颜色</translation> </message> <message> <location line="+26"/> <source>Enter the path or filename</source> - <translation type="unfinished">输入路径或文件名</translation> + <translation>输入路径或文件名</translation> </message> <message> <location line="+11"/> <source>One directory up</source> - <translation type="unfinished">向上一级</translation> + <translation>向上一级</translation> </message> <message> <location line="+4"/> <source>Show Octave directory</source> - <translation type="unfinished">显示 Octave 目录</translation> + <translation>显示 Octave 目录</translation> </message> <message> <location line="+2"/> <source>Go to current Octave directory</source> - <translation type="unfinished">前往当前的 Octave 目录</translation> + <translation>前往当前的 Octave 目录</translation> </message> <message> <location line="+5"/> <source>Set Octave directory</source> - <translation type="unfinished">设置 Octave 目录</translation> + <translation>设置 Octave 目录</translation> </message> <message> <location line="+2"/> <source>Set Octave directory to current browser directory</source> - <translation type="unfinished">设置 Octave 目录到当前浏览器目录</translation> + <translation>设置 Octave 目录到当前浏览器目录</translation> </message> <message> <location line="+4"/> <source>Actions on current directory</source> - <translation type="unfinished">在当前目录的操作</translation> + <translation>在当前目录的操作</translation> </message> <message> <location line="+3"/> <source>Show Home Directory</source> - <translation type="unfinished">显示主目录</translation> + <translation>显示主目录</translation> </message> <message> <location line="+12"/> <source>Set Browser Directory...</source> - <translation type="unfinished">设置浏览器目录...</translation> + <translation>设置浏览器目录...</translation> </message> <message> <location line="+4"/> <location line="+365"/> <source>Find Files...</source> - <translation type="unfinished">查找文件...</translation> + <translation>查找文件...</translation> </message> <message> <location line="-361"/> <location line="+374"/> <source>New File...</source> - <translation type="unfinished">新建文件...</translation> + <translation>新建文件...</translation> </message> <message> <location line="-371"/> <location line="+374"/> <source>New Directory...</source> - <translation type="unfinished">新建目录...</translation> + <translation>新建目录...</translation> </message> <message> <location line="-320"/> <source>Activate to open in editor, right click for alternatives</source> - <translation type="unfinished">激活以在编辑器中打开，右击选择</translation> + <translation>激活以在编辑器中打开，右击选择</translation> </message> <message> <location line="+273"/> <source>Open</source> - <translation type="unfinished">打开</translation> + <translation>打开</translation> </message> <message> <location line="+5"/> <source>Open in System File Explorer</source> - <translation type="unfinished">在系统文件浏览器中打开</translation> + <translation>在系统文件浏览器中打开</translation> </message> <message> <location line="+5"/> <source>Open in Text Editor</source> - <translation type="unfinished">在文本编辑器中打开</translation> + <translation>在文本编辑器中打开</translation> </message> <message> <location line="+3"/> <source>Copy Selection to Clipboard</source> - <translation type="unfinished">复制选中到剪贴板</translation> + <translation>复制选中到剪贴板</translation> </message> <message> <location line="+5"/> <source>Run</source> - <translation type="unfinished">运行</translation> + <translation>运行</translation> </message> <message> <location line="+3"/> <source>Load Data</source> - <translation type="unfinished">载入数据</translation> + <translation>载入数据</translation> </message> <message> <location line="+6"/> <source>Set Current Directory</source> - <translation type="unfinished">设置当前目录</translation> + <translation>设置当前目录</translation> </message> <message> <location line="+9"/> <source>Rename...</source> - <translation type="unfinished">重命名...</translation> + <translation>重命名...</translation> </message> <message> <location line="+2"/> <source>Delete...</source> - <translation type="unfinished">删除...</translation> + <translation>删除...</translation> </message> <message> <location line="+118"/> <source>Rename file/directory</source> - <translation type="unfinished">重命名文件/目录</translation> + <translation>重命名文件/目录</translation> </message> <message> <location line="+1"/> <source>Rename file/directory: </source> - <translation type="unfinished">重命名文件/目录: + <translation>重命名文件/目录: </translation> </message> <message> <location line="+1"/> <source> to: </source> - <translation type="unfinished"> -到: </translation> + <translation> + 到: </translation> </message> <message> <location line="+30"/> <location line="+14"/> <source>Delete file/directory</source> - <translation type="unfinished">删除文件/目录</translation> + <translation>删除文件/目录</translation> </message> <message> <location line="-13"/> <source>Are you sure you want to delete </source> - <translation type="unfinished">你确实希望删除 + <translation>你确实希望删除 </translation> </message> <message> <location line="+14"/> <source>Can not delete a directory that is not empty</source> - <translation type="unfinished">不能删除一个非空目录</translation> + <translation>不能删除一个非空目录</translation> </message> <message> <location line="+145"/> <source>Set directory of file browser</source> - <translation type="unfinished">设置目录到文件浏览器</translation> + <translation>设置目录到文件浏览器</translation> </message> <message> <location line="+26"/> <source>Create File</source> - <translation type="unfinished">创建文件</translation> + <translation>创建文件</translation> </message> <message> <location line="+1"/> <source>Create file in </source> <comment>String ends with \n!</comment> - <translation type="unfinished">创建文件于 + <translation>创建文件于 </translation> </message> <message> <location line="+2"/> <source>New File.txt</source> - <translation type="unfinished">新建文件.txt</translation> + <translation>新建文件.txt</translation> </message> <message> <location line="+15"/> <source>Create Directory</source> - <translation type="unfinished">创建目录</translation> + <translation>创建目录</translation> </message> <message> <location line="+1"/> <source>Create folder in </source> <comment>String ends with \n!</comment> - <translation type="unfinished">创建目录于 + <translation>创建目录于 </translation> </message> <message> <location line="+2"/> <source>New Directory</source> - <translation type="unfinished">新建目录</translation> + <translation>新建目录</translation> </message> </context> <context> @@ -2041,22 +2053,22 @@ <message> <location filename="../src/welcome-wizard.cc" line="+274"/> <source>Enjoy!</source> - <translation type="unfinished">尽情享受吧！</translation> + <translation>尽情享受吧！</translation> </message> <message> <location line="+4"/> <source>Previous</source> - <translation type="unfinished">上一个</translation> + <translation>上一个</translation> </message> <message> <location line="+1"/> <source>Finish</source> - <translation type="unfinished">完成</translation> + <translation>完成</translation> </message> <message> <location line="+1"/> <source>Cancel</source> - <translation type="unfinished">取消</translation> + <translation>取消</translation> </message> <message> <location line="+7"/> @@ -2065,7 +2077,11 @@ <p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other community-based support channels. You can find more information about each of these by visiting <a href="https://octave.org/support.html">https://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> - <translation type="unfinished"></translation> + <translation><html><body> +<p>我们希望Octave是一个能够帮助到你的有用工具。</p> +<p>如果遇到问题，可以通过多种方式获得帮助，包括商业支持选项，邮件列表，wiki以及其他社区支持渠道。 +你可以通过访问 <a href="http://octave.org/support.html">http://octave.org/support.html</a> 找到更多信息(在外部浏览器中打开).</p> +</body></html></translation> </message> <message> <location line="+21"/> @@ -2081,7 +2097,18 @@ <li>Open the documentation browser of the Octave GUI with the help menu</li> </ul> </body></html></source> - <translation type="unfinished"></translation> + <translation><html><head> +<style> +a:link { text-decoration: underline; color: #0000ff; } +</style> +<head/><body> +<p>更多信息关于 Octave:</p> +<ul> +<li>访问 <a href="https://octave.org">https://octave.org</a> (在外部浏览器中打开)</li> +<li>获取在线的 <a href="https://www.gnu.org/software/octave/doc/interpreter/index.html">html</a>- 或 <a href="https://www.gnu.org/software/octave/octave.pdf">pdf</span></a>-文档 (在外部浏览器中打开)</li> +<li>在帮助菜单打开Octave GUI的文档浏览器</li> +</ul> +</body></html></translation> </message> </context> <context> @@ -2089,107 +2116,107 @@ <message> <location filename="../src/m-editor/find-dialog.cc" line="+87"/> <source>Find and Replace</source> - <translation type="unfinished">查找并替换</translation> + <translation>查找并替换</translation> </message> <message> <location line="+3"/> <source>Find &what:</source> - <translation type="unfinished">搜索 (&W) : </translation> + <translation>搜索 (&W):</translation> </message> <message> <location line="+3"/> <source>Re&place with:</source> - <translation type="unfinished">替换为 (&P) : </translation> + <translation>替换为 (&P):</translation> </message> <message> <location line="+4"/> <source>Match &case</source> - <translation type="unfinished">匹配大小写 (&C)</translation> + <translation>匹配大小写 (&C)</translation> </message> <message> <location line="+1"/> <source>Search from &start</source> - <translation type="unfinished">从开头搜索 (&S)</translation> + <translation>从开头搜索 (&S)</translation> </message> <message> <location line="+1"/> <source>&Wrap while searching</source> - <translation type="unfinished">搜索时循环 (&W)</translation> + <translation>搜索时循环 (&W)</translation> </message> <message> <location line="+2"/> <source>&Find Next</source> - <translation type="unfinished">查找下一个 (&F)</translation> + <translation>查找下一个 (&F)</translation> </message> <message> <location line="+1"/> <source>Find &Previous</source> - <translation type="unfinished">查找上一个 (&P)</translation> + <translation>查找上一个 (&P)</translation> </message> <message> <location line="+1"/> <source>&Replace</source> - <translation type="unfinished">替换 (&R)</translation> + <translation>替换 (&R)</translation> </message> <message> <location line="+1"/> <source>Replace &All</source> - <translation type="unfinished">替换全部 (&A)</translation> + <translation>替换全部 (&A)</translation> </message> <message> <location line="+2"/> <source>&More...</source> - <translation type="unfinished">更多 (&M) ...</translation> + <translation>更多 (&M) ...</translation> </message> <message> <location line="+13"/> <source>&Whole words</source> - <translation type="unfinished">整个单词 (&W)</translation> + <translation>整个单词 (&W)</translation> </message> <message> <location line="+1"/> <source>Regular E&xpressions</source> - <translation type="unfinished">正则表达式 (&X)</translation> + <translation>正则表达式 (&X)</translation> </message> <message> <location line="+1"/> <source>Search &backward</source> - <translation type="unfinished">反向搜索 (&B)</translation> + <translation>反向搜索 (&B)</translation> </message> <message> <location line="+1"/> <source>Search se&lection</source> - <translation type="unfinished">搜索选中 (&L)</translation> + <translation>搜索选中 (&L)</translation> </message> <message> <location line="+86"/> <source>Search from end</source> - <translation type="unfinished">从尾部搜索</translation> + <translation>从尾部搜索</translation> </message> <message> <location line="+2"/> <source>Search from start</source> - <translation type="unfinished">从开头搜索</translation> + <translation>从开头搜索</translation> </message> <message> <location line="+209"/> <source>Replace Result</source> - <translation type="unfinished">替换结果</translation> + <translation>替换结果</translation> </message> <message> <location line="+1"/> <source>%1 items replaced</source> - <translation type="unfinished">%1 项已替换</translation> + <translation>%1 项已替换</translation> </message> <message> <location line="+14"/> <source>Find Result</source> - <translation type="unfinished">查找结果</translation> + <translation>查找结果</translation> </message> <message> <location line="+1"/> <source>No more matches found</source> - <translation type="unfinished">没有更多匹配项</translation> + <translation>没有更多匹配项</translation> </message> </context> <context> @@ -2197,147 +2224,147 @@ <message> <location filename="../src/find-files-dialog.cc" line="+54"/> <source>Find Files</source> - <translation type="unfinished">查找文件</translation> + <translation>查找文件</translation> </message> <message> <location line="+11"/> <source>Named:</source> - <translation type="unfinished">名称: </translation> + <translation>名称:</translation> </message> <message> <location line="+2"/> <source>Enter the filename search expression</source> - <translation type="unfinished">输入文件名搜索表达式</translation> + <translation>输入文件名搜索表达式</translation> </message> <message> <location line="+6"/> <source>Start in:</source> - <translation type="unfinished">从: </translation> + <translation>从:</translation> </message> <message> <location line="+5"/> <source>Enter the start directory</source> - <translation type="unfinished">进入初始目录</translation> + <translation>进入初始目录</translation> </message> <message> <location line="+3"/> <source>Browse...</source> - <translation type="unfinished">浏览...</translation> + <translation>浏览...</translation> </message> <message> <location line="+1"/> <source>Browse for start directory</source> - <translation type="unfinished">从初始目录浏览</translation> + <translation>从初始目录浏览</translation> </message> <message> <location line="+4"/> <source>Search subdirectories</source> - <translation type="unfinished">搜索子目录</translation> + <translation>搜索子目录</translation> </message> <message> <location line="+3"/> <source>Search recursively through directories for matching files</source> - <translation type="unfinished">递归搜索目录以查找匹配文件</translation> + <translation>递归搜索目录以查找匹配文件</translation> </message> <message> <location line="+2"/> <source>Include directory names</source> - <translation type="unfinished">包含的目录名</translation> + <translation>包含的目录名</translation> </message> <message> <location line="+3"/> <source>Include matching directories in search results</source> - <translation type="unfinished">在搜索结果中包含匹配目录</translation> + <translation>在搜索结果中包含匹配目录</translation> </message> <message> <location line="+2"/> <source>Name case insensitive</source> - <translation type="unfinished">名称大小写敏感</translation> + <translation>名称大小写敏感</translation> </message> <message> <location line="+3"/> <source>Set matching name is case insensitive</source> - <translation type="unfinished">设置匹配名称大小写敏感</translation> + <translation>设置匹配名称大小写敏感</translation> </message> <message> <location line="+2"/> <source>Contains text:</source> - <translation type="unfinished">包含文字: </translation> + <translation>包含文本:</translation> </message> <message> <location line="+1"/> <source>Enter the file content search expression</source> - <translation type="unfinished">输入文件内容搜索表达式</translation> + <translation>输入文件内容搜索表达式</translation> </message> <message> <location line="+5"/> <source>Text to match</source> - <translation type="unfinished">要匹配的文字</translation> + <translation>要匹配的文字</translation> </message> <message> <location line="+4"/> <source>Text case insensitive</source> - <translation type="unfinished">文字大小写敏感</translation> + <translation>文字大小写敏感</translation> </message> <message> <location line="+3"/> <source>Set text content is case insensitive</source> - <translation type="unfinished">设置文字内容大小写敏感</translation> + <translation>设置文字内容大小写敏感</translation> </message> <message> <location line="+11"/> <source>Search results</source> - <translation type="unfinished">搜索结果</translation> + <translation>搜索结果</translation> </message> <message> <location line="+19"/> <source>Idle.</source> - <translation type="unfinished">空闲。</translation> + <translation>空闲。</translation> </message> <message> <location line="+2"/> <source>Find</source> - <translation type="unfinished">查找</translation> + <translation>查找</translation> </message> <message> <location line="+1"/> <source>Start search for matching files</source> - <translation type="unfinished">开始查找匹配文件</translation> + <translation>开始查找匹配文件</translation> </message> <message> <location line="+4"/> <source>Stop</source> - <translation type="unfinished">停止</translation> + <translation>停止</translation> </message> <message> <location line="+1"/> <source>Stop searching</source> - <translation type="unfinished">停止搜索</translation> + <translation>停止搜索</translation> </message> <message> <location line="+15"/> <source>Filename/location</source> - <translation type="unfinished">文件名/位置</translation> + <translation>文件名/位置</translation> </message> <message> <location line="+17"/> <source>File contents</source> - <translation type="unfinished">文件内容</translation> + <translation>文件内容</translation> </message> <message> <location line="+103"/> <source>Searching...</source> - <translation type="unfinished">正在搜索...</translation> + <translation>正在搜索...</translation> </message> <message> <location line="+22"/> <source>%1 match (es)</source> - <translation type="unfinished"></translation> + <translation>%1 个匹配</translation> </message> <message> <location line="+8"/> <source>Set search directory</source> - <translation type="unfinished">设置搜索目录</translation> + <translation>设置搜索目录</translation> </message> </context> <context> @@ -2345,12 +2372,12 @@ <message> <location filename="../src/find-files-model.cc" line="+88"/> <source>Filename</source> - <translation type="unfinished">文件名</translation> + <translation>文件名</translation> </message> <message> <location line="+1"/> <source>Directory</source> - <translation type="unfinished">目录</translation> + <translation>目录</translation> </message> </context> <context> @@ -2358,52 +2385,52 @@ <message> <location filename="../src/history-dock-widget.cc" line="+48"/> <source>Browse and search the command history.</source> - <translation type="unfinished">浏览并搜索命令历史。</translation> + <translation>浏览并搜索命令历史。</translation> </message> <message> <location line="+94"/> <source>Copy</source> - <translation type="unfinished">复制</translation> + <translation>复制</translation> </message> <message> <location line="+1"/> <source>Evaluate</source> - <translation type="unfinished">评估</translation> + <translation>评估</translation> </message> <message> <location line="+3"/> <source>Create script</source> - <translation type="unfinished">创建脚本</translation> + <translation>创建脚本</translation> </message> <message> <location line="+4"/> <source>Hide filter</source> - <translation type="unfinished">隐藏过滤器</translation> + <translation>隐藏过滤器</translation> </message> <message> <location line="+3"/> <source>Show filter</source> - <translation type="unfinished">显示过滤器</translation> + <translation>显示过滤器</translation> </message> <message> <location line="+123"/> <source>Double-click a command to transfer it to the terminal.</source> - <translation type="unfinished">双击一个命令以传递到终端。</translation> + <translation>双击一个命令以传递到终端。</translation> </message> <message> <location line="+8"/> <source>Enter text to filter the command history</source> - <translation type="unfinished">输入文本以过滤命令历史记录</translation> + <translation>输入文本以过滤命令历史记录</translation> </message> <message> <location line="+10"/> <source>Filter</source> - <translation type="unfinished">过滤器</translation> + <translation>过滤器</translation> </message> <message> <location line="+5"/> <source>Command History</source> - <translation type="unfinished">命令历史</translation> + <translation>命令历史</translation> </message> </context> <context> @@ -2411,17 +2438,17 @@ <message> <location filename="../src/welcome-wizard.cc" line="-178"/> <source>Welcome to Octave!</source> - <translation type="unfinished">欢迎来到 Octave!</translation> + <translation>欢迎来到 Octave!</translation> </message> <message> <location line="+3"/> <source>Next</source> - <translation type="unfinished">下一个</translation> + <translation>下一个</translation> </message> <message> <location line="+1"/> <source>Cancel</source> - <translation type="unfinished">取消</translation> + <translation>取消</translation> </message> <message> <location line="+7"/> @@ -2430,7 +2457,7 @@ Click 'Next' to create a configuration file and launch Octave.</p> <p>The configuration file is stored in<br>%1.</p> </body></html></source> - <translation type="unfinished"><html><body> + <translation><html><body> <p>看起来这是你第一次在这台电脑上使用 Octave 图形界面。 点击 '下一步' 以创建一个配置文件并启动 Octave .</p> <p>配置文件存放于<br>%1.</p> @@ -2442,12 +2469,12 @@ <message> <location filename="../src/octave-dock-widget.cc" line="+52"/> <source>Undock widget</source> - <translation type="unfinished">取消组件停靠</translation> + <translation>取消组件停靠</translation> </message> <message> <location line="+8"/> <source>Close widget</source> - <translation type="unfinished"></translation> + <translation>关闭组件</translation> </message> </context> <context> @@ -2455,377 +2482,377 @@ <message> <location filename="../src/main-window.cc" line="+367"/> <source>Save Workspace As</source> - <translation type="unfinished">工作空间另存为</translation> + <translation>工作空间另存为</translation> </message> <message> <location line="+14"/> <source>Load Workspace</source> - <translation type="unfinished">载入工作空间</translation> + <translation>载入工作空间</translation> </message> <message> <location line="+85"/> <source>The release notes file '%1' is empty.</source> - <translation type="unfinished">发行注记文件 '%1' 是空的。</translation> + <translation>发行注记文件 '%1' 是空的。</translation> </message> <message> <location line="+4"/> <source>The release notes file '%1' cannot be read.</source> - <translation type="unfinished">发行注记文件 '%1' 无法读取。</translation> + <translation>发行注记文件 '%1' 无法读取。</translation> </message> <message> <location line="+12"/> <source>Octave Release Notes</source> - <translation type="unfinished">Octave 发行注记</translation> + <translation>Octave 发行注记</translation> </message> <message> <location line="+79"/> <source>Octave Community News</source> - <translation type="unfinished">Octave 社区新闻</translation> + <translation>Octave 社区新闻</translation> </message> <message> <location line="+91"/> <location line="+1747"/> <source>About Octave</source> - <translation type="unfinished">关于 Octave</translation> + <translation>关于 Octave</translation> </message> <message> <location line="-1626"/> <source>Octave</source> - <translation type="unfinished">Octave</translation> + <translation>Octave</translation> </message> <message> <location line="+1"/> <source>Are you sure you want to exit Octave?</source> - <translation type="unfinished">确定要退出 Octave 吗？</translation> + <translation>确定要退出 Octave 吗？</translation> </message> <message> <location line="+64"/> <location line="+1623"/> <source>Browse directories</source> - <translation type="unfinished">浏览目录</translation> + <translation>浏览目录</translation> </message> <message> <location line="-1467"/> <source>Octave Files (*.m);;All Files (*)</source> - <translation type="unfinished">Octave 文件 (*.m);;所有文件 (*)</translation> + <translation>Octave 文件 (*.m);;所有文件 (*)</translation> </message> <message> <location line="+16"/> <source>File Encoding:</source> - <translation type="unfinished">文件编码:</translation> + <translation>文件编码:</translation> </message> <message> <location line="+53"/> <source>New Function</source> - <translation type="unfinished">新建函数</translation> + <translation>新建函数</translation> </message> <message> <location line="+1"/> <source>New function name: </source> - <translation type="unfinished">新建函数的名称: + <translation>新建函数的名称: </translation> </message> <message> <location line="+43"/> <source>%1 is a built-in function</source> - <translation type="unfinished">%1 是内置函数</translation> + <translation>%1 是内置函数</translation> </message> <message> <location line="+37"/> <source>Can not find function %1</source> - <translation type="unfinished">找不到函数 %1</translation> + <translation>找不到函数 %1</translation> </message> <message> <location line="+9"/> <source>Octave Editor</source> - <translation type="unfinished">Octave 编辑器</translation> + <translation>Octave 编辑器</translation> </message> <message> <location line="+932"/> <source>&File</source> - <translation type="unfinished">文件 (&F)</translation> + <translation>文件 (&F)</translation> </message> <message> <location line="+6"/> <source>Open...</source> - <translation type="unfinished">打开...</translation> + <translation>打开...</translation> </message> <message> <location line="+2"/> <source>Open an existing file in editor</source> - <translation type="unfinished">在编辑器中打开一个已存在的文件</translation> + <translation>在编辑器中打开一个已存在的文件</translation> </message> <message> <location line="+9"/> <source>Load Workspace...</source> - <translation type="unfinished">载入工作空间...</translation> + <translation>载入工作空间...</translation> </message> <message> <location line="+3"/> <source>Save Workspace As...</source> - <translation type="unfinished">工作空间另存为...</translation> + <translation>工作空间另存为...</translation> </message> <message> <location line="+4"/> <source>Exit</source> - <translation type="unfinished">退出</translation> + <translation>退出</translation> </message> <message> <location line="+18"/> <source>New</source> - <translation type="unfinished">新建</translation> + <translation>新建</translation> </message> <message> <location line="+4"/> <source>New Script</source> - <translation type="unfinished">新建脚本</translation> + <translation>新建脚本</translation> </message> <message> <location line="+3"/> <source>New Function...</source> - <translation type="unfinished">新建函数</translation> + <translation>新建函数...</translation> </message> <message> <location line="+4"/> <source>New Figure</source> - <translation type="unfinished">新建图表</translation> + <translation>新建图表</translation> </message> <message> <location line="+26"/> <source>&Edit</source> - <translation type="unfinished">编辑 (&E)</translation> + <translation>编辑 (&E)</translation> </message> <message> <location line="+5"/> <source>Undo</source> - <translation type="unfinished">撤销</translation> + <translation>撤销</translation> </message> <message> <location line="+7"/> <source>Copy</source> - <translation type="unfinished">复制</translation> + <translation>复制</translation> </message> <message> <location line="+5"/> <source>Paste</source> - <translation type="unfinished">粘贴</translation> + <translation>粘贴</translation> </message> <message> <location line="+4"/> <source>Select All</source> - <translation type="unfinished">全选</translation> + <translation>全选</translation> </message> <message> <location line="+4"/> <source>Clear Clipboard</source> - <translation type="unfinished">清空剪贴板</translation> + <translation>清空剪贴板</translation> </message> <message> <location line="+7"/> <source>Find Files...</source> - <translation type="unfinished">查找文件...</translation> + <translation>查找文件...</translation> </message> <message> <location line="+5"/> <source>Clear Command Window</source> - <translation type="unfinished">清空命令窗口</translation> + <translation>清空命令窗口</translation> </message> <message> <location line="+3"/> <source>Clear Command History</source> - <translation type="unfinished">清空命令历史</translation> + <translation>清空命令历史</translation> </message> <message> <location line="+3"/> <source>Clear Workspace</source> - <translation type="unfinished">清空工作空间</translation> + <translation>清空工作空间</translation> </message> <message> <location line="+6"/> <source>Preferences...</source> - <translation type="unfinished">首选项...</translation> + <translation>首选项...</translation> </message> <message> <location line="+49"/> <source>De&bug</source> - <translation type="unfinished">调试 (&B)</translation> + <translation>调试 (&B)</translation> </message> <message> <location line="+3"/> <source>Step</source> - <translation type="unfinished">步骤</translation> + <translation>步骤</translation> </message> <message> <location line="+4"/> <source>Step In</source> - <translation type="unfinished">步进</translation> + <translation>步进</translation> </message> <message> <location line="+4"/> <source>Step Out</source> - <translation type="unfinished">步出</translation> + <translation>步出</translation> </message> <message> <location line="+4"/> <source>Continue</source> - <translation type="unfinished">继续</translation> + <translation>继续</translation> </message> <message> <location line="+9"/> <source>Quit Debug Mode</source> - <translation type="unfinished">退出调试</translation> + <translation>退出调试</translation> </message> <message> <location line="+38"/> <source>&Window</source> - <translation type="unfinished">窗口 (&W)</translation> + <translation>窗口 (&W)</translation> </message> <message> <location line="+3"/> <source>Show Command Window</source> - <translation type="unfinished">显示命令窗口</translation> + <translation>显示命令窗口</translation> </message> <message> <location line="+3"/> <source>Show Command History</source> - <translation type="unfinished">显示命令历史</translation> + <translation>显示命令历史</translation> </message> <message> <location line="+3"/> <source>Show File Browser</source> - <translation type="unfinished">显示文件浏览器</translation> + <translation>显示文件浏览器</translation> </message> <message> <location line="+3"/> <source>Show Workspace</source> - <translation type="unfinished">显示工作空间</translation> + <translation>显示工作空间</translation> </message> <message> <location line="+3"/> <source>Show Editor</source> - <translation type="unfinished">显示编辑器</translation> + <translation>显示编辑器</translation> </message> <message> <location line="+3"/> <source>Show Documentation</source> - <translation type="unfinished">显示文档</translation> + <translation>显示文档</translation> </message> <message> <location line="+3"/> <source>Show Variable Editor</source> - <translation type="unfinished"></translation> + <translation>显示变量编辑器</translation> </message> <message> <location line="+5"/> <source>Command Window</source> - <translation type="unfinished">命令窗口</translation> + <translation>命令窗口</translation> </message> <message> <location line="+3"/> <source>Command History</source> - <translation type="unfinished">命令历史</translation> + <translation>命令历史</translation> </message> <message> <location line="+3"/> <source>File Browser</source> - <translation type="unfinished">文件浏览器</translation> + <translation>文件浏览器</translation> </message> <message> <location line="+3"/> <source>Workspace</source> - <translation type="unfinished">工作空间</translation> + <translation>工作空间</translation> </message> <message> <location line="+3"/> <source>Editor</source> - <translation type="unfinished"> 编辑器</translation> + <translation>编辑器</translation> </message> <message> <location line="+3"/> <location line="+39"/> <source>Documentation</source> - <translation type="unfinished">文档</translation> + <translation>文档</translation> </message> <message> <location line="-36"/> <source>Variable Editor</source> - <translation type="unfinished"></translation> + <translation>变量编辑器</translation> </message> <message> <location line="+5"/> <source>Reset Default Window Layout</source> - <translation type="unfinished">复位为默认窗口布局</translation> + <translation>复位为默认窗口布局</translation> </message> <message> <location line="+5"/> <source>&Help</source> - <translation type="unfinished">帮助 (&H)</translation> + <translation>帮助 (&H)</translation> </message> <message> <location line="+7"/> <source>Report Bug</source> - <translation type="unfinished">报告问题</translation> + <translation>报告问题</translation> </message> <message> <location line="+3"/> <source>Octave Packages</source> - <translation type="unfinished">Octave 软件包</translation> + <translation>Octave 软件包</translation> </message> <message> <location line="+3"/> <source>Contribute</source> - <translation type="unfinished">参与 Octave</translation> + <translation>参与 Octave</translation> </message> <message> <location line="+3"/> <source>Donate to Octave</source> - <translation type="unfinished">捐赠 Octave</translation> + <translation>捐赠 Octave</translation> </message> <message> <location line="+13"/> <source>On Disk</source> - <translation type="unfinished">磁盘上</translation> + <translation>本地</translation> </message> <message> <location line="+3"/> <source>Online</source> - <translation type="unfinished">在线</translation> + <translation>在线</translation> </message> <message> <location line="+5"/> <source>&News</source> - <translation type="unfinished">新闻 (&N)</translation> + <translation>新闻 (&N)</translation> </message> <message> <location line="+3"/> <source>Release Notes</source> - <translation type="unfinished">发行注记</translation> + <translation>发行注记</translation> </message> <message> <location line="+3"/> <source>Community News</source> - <translation type="unfinished">社区新闻</translation> + <translation>社区新闻</translation> </message> <message> <location line="+5"/> <source>Toolbar</source> - <translation type="unfinished">工具栏</translation> + <translation>工具栏</translation> </message> <message> <location line="+19"/> <source>Enter directory name</source> - <translation type="unfinished">输入目录名</translation> + <translation>输入目录名</translation> </message> <message> <location line="+9"/> <source>Current Directory: </source> - <translation type="unfinished">当前目录: </translation> + <translation>当前目录: </translation> </message> <message> <location line="+4"/> <source>One directory up</source> - <translation type="unfinished">向上一级</translation> + <translation>向上一级</translation> </message> </context> <context> @@ -2844,7 +2871,18 @@ </p> <p> <small><em>&mdash; The Octave Developers, </source> - <translation type="unfinished"></translation> + <translation><html> +<body> +<p> +Octave的社区新闻源似乎无法连接。 +</p> +<p> +当您连接到互联网时，请访问 +<a href="https://octave.org/community-news.html">https://octave.org/community-news.html</a> +获取最新新闻(在外部浏览器中打开链接)。 +</p> +<p> +<small><em>&mdash; Octave开发者, </translation> </message> <message> <location line="+18"/> @@ -2861,7 +2899,19 @@ </p> <p> <small><em>&mdash; The Octave Developers, </source> - <translation type="unfinished"></translation> + <translation><html> +<body> +<p> +链接互联网显示最新Octave社区新闻已经被禁用。 +</p> +<p> +当您连接到互联网时，请访问 +<a href="https://octave.org/community-news.html">https://octave.org/community-news.html</a> +获取最新新闻(在外部浏览器中打开链接) +或者在Octave网络设置对话框中启用互联网连接。 +</p> +<p> +<small><em>&mdash; Octave开发者, </translation> </message> </context> <context> @@ -2869,22 +2919,22 @@ <message> <location filename="../src/octave-dock-widget.cc" line="+69"/> <source>Hide widget</source> - <translation type="unfinished">隐藏组件</translation> + <translation>隐藏组件</translation> </message> <message> <location line="+43"/> <source>Use <Alt> + <Left Mouse Button> for moving the window</source> - <translation type="unfinished"></translation> + <translation>使用 <Alt> + <Left Mouse Button> 移动窗口</translation> </message> <message> <location line="+5"/> <source>Dock widget</source> - <translation type="unfinished">停靠组件</translation> + <translation>停靠组件</translation> </message> <message> <location line="+46"/> <source>Undock widget</source> - <translation type="unfinished">取消组件停靠</translation> + <translation>取消组件停靠</translation> </message> </context> <context> @@ -2892,27 +2942,27 @@ <message> <location filename="../src/m-editor/octave-qscintilla.cc" line="+277"/> <source>Help on</source> - <translation type="unfinished">开启帮助</translation> + <translation>开启帮助</translation> </message> <message> <location line="+2"/> <source>Documentation on</source> - <translation type="unfinished">开启文档</translation> + <translation>开启文档</translation> </message> <message> <location line="+3"/> <source>Edit</source> - <translation type="unfinished">编辑</translation> + <translation>编辑</translation> </message> <message> <location line="+15"/> <source>dbstop if ...</source> - <translation type="unfinished">dbstop 如果 ...</translation> + <translation>dbstop 如果 ...</translation> </message> <message> <location line="+461"/> <source>Press '%1' to replace all occurrences of '%2' with '%3'.</source> - <translation type="unfinished"></translation> + <translation>按'%1将所有出现的'%2'替换为'%3'。</translation> </message> </context> <context> @@ -2922,50 +2972,52 @@ <location line="+9"/> <location line="+11"/> <source>Create</source> - <translation type="unfinished">创建</translation> + <translation>创建</translation> </message> <message> <location line="-20"/> <location line="+268"/> <source>Cancel</source> - <translation type="unfinished">取消</translation> + <translation>取消</translation> </message> <message> <location line="-262"/> <source>File %1 does not exist. Do you want to create it?</source> - <translation type="unfinished"></translation> + <translation>文件 +%1 +不存在。你希望创建它吗？</translation> </message> <message> <location line="+3"/> <source>Octave Editor</source> - <translation type="unfinished">Octave 编辑器</translation> + <translation>Octave 编辑器</translation> </message> <message> <location line="+252"/> <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation type="unfinished">加载路径中文件 %1 不存在。如要运行或调试正在编辑的函数，请转到目录 %2 或添加其至加载路径。</translation> + <translation>加载路径中文件 %1 不存在。如要运行或调试正在编辑的函数，请转到目录 %2 或添加其至加载路径。</translation> </message> <message> <location line="+1"/> <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> - <translation type="unfinished">文件 %1 被加载路径中同名文件隐藏。 如要运行或调试正在编辑的函数，请切换到目录 %2 。</translation> + <translation>文件 %1 被加载路径中同名文件隐藏。 如要运行或调试正在编辑的函数，请切换到目录 %2 。</translation> </message> <message> <location line="+2"/> <source>Change Directory or Add Directory to Load Path</source> - <translation type="unfinished">切换目录或添加目录到载入路径</translation> + <translation>切换目录或添加目录到载入路径</translation> </message> <message> <location line="+2"/> <source>&Change Directory</source> - <translation type="unfinished"></translation> + <translation>切换目录 (&C)</translation> </message> <message> <location line="+1"/> <source>&Add Directory to Load Path</source> - <translation type="unfinished"></translation> + <translation>添加目录到载入路径 (&A)</translation> </message> </context> <context> @@ -2973,7 +3025,7 @@ <message> <location filename="../src/m-editor/octave-txt-lexer.cc" line="+40"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> </context> <context> @@ -2987,7 +3039,7 @@ %2 Octave GUI must be closed now.</source> - <translation type="unfinished">配置文件 + <translation>配置文件 %1 不存在且不能被创建。 请确定你在如下目录有写入权限。 @@ -2998,7 +3050,7 @@ <message> <location line="+5"/> <source>Octave Critical Error</source> - <translation type="unfinished">Octave 严重错误</translation> + <translation>Octave 严重错误</translation> </message> </context> <context> @@ -3006,22 +3058,22 @@ <message> <location filename="../src/welcome-wizard.cc" line="+42"/> <source>Community News</source> - <translation type="unfinished">社区新闻</translation> + <translation>社区新闻</translation> </message> <message> <location line="+5"/> <source>Previous</source> - <translation type="unfinished">上一个</translation> + <translation>上一个</translation> </message> <message> <location line="+1"/> <source>Next</source> - <translation type="unfinished">下一个</translation> + <translation>下一个</translation> </message> <message> <location line="+1"/> <source>Cancel</source> - <translation type="unfinished">取消</translation> + <translation>取消</translation> </message> <message> <location line="+7"/> @@ -3031,7 +3083,12 @@ <p>You may also view the news by selecting the "Community News" item in the "Help" menu, or by visiting <a href="https://octave.org/community-news.html">https://octave.org/community-news.html</a>.</p> </body></html></source> - <translation type="unfinished"></translation> + <translation><html><body> +<p>当 Octave GUI 启动的时候，它会检查 Octave 站点上关于 Octave 社区的新闻和信息。 +每天会检查一次新闻消息，而只有在你上次阅读新闻起有新的新闻出现时才会弹出。</p> +<p>你也可以点选 GUI 上的 "社区新闻" 以直接阅读新闻，或直接访问: +<a href="http://octave.org/community-news.html">http://octave.org/community-news.html</a>.</p> +</body></html></translation> </message> <message> <location line="+28"/> @@ -3042,7 +3099,7 @@ <head/><body> <p>Allow Octave to connect to the Octave web site when it starts to display current news and information about the Octave community.</p> </body></html></source> - <translation type="unfinished"><html><head> + <translation><html><head> <style> a:link { text-decoration: underline; color: #0000ff; } </style> @@ -3056,7 +3113,7 @@ <message> <location filename="../src/shortcut-manager.cc" line="+131"/> <source>Double Shortcut</source> - <translation type="unfinished">双快捷键</translation> + <translation>双快捷键</translation> </message> <message> <location line="+1"/> @@ -3065,7 +3122,7 @@ is already used for the action "%2". Do you want to use the shortcut anyhow removing it from the previous action?</source> - <translation type="unfinished">选择的快捷键 + <translation>选择的快捷键 "%1" 已经被动作 "%2"使用。 @@ -3074,679 +3131,679 @@ <message> <location line="+102"/> <source>New File</source> - <translation type="unfinished">新建文件</translation> + <translation>新建文件</translation> </message> <message> <location line="+1"/> <source>New Function</source> - <translation type="unfinished">新建函数</translation> + <translation>新建函数</translation> </message> <message> <location line="+2"/> <source>New Figure</source> - <translation type="unfinished">新建图表</translation> + <translation>新建图表</translation> </message> <message> <location line="+1"/> <source>Open File</source> - <translation type="unfinished">打开文件</translation> + <translation>打开文件</translation> </message> <message> <location line="+1"/> <source>Load Workspace</source> - <translation type="unfinished">载入工作空间</translation> + <translation>载入工作空间</translation> </message> <message> <location line="+1"/> <source>Save Workspace As</source> - <translation type="unfinished">工作空间另存为</translation> + <translation>工作空间另存为</translation> </message> <message> <location line="+1"/> <source>Exit Octave</source> - <translation type="unfinished">退出 Octave</translation> + <translation>退出 Octave</translation> </message> <message> <location line="+3"/> <source>Copy</source> - <translation type="unfinished">复制</translation> + <translation>复制</translation> </message> <message> <location line="+1"/> <source>Paste</source> - <translation type="unfinished">粘贴</translation> + <translation>粘贴</translation> </message> <message> <location line="+1"/> <source>Undo</source> - <translation type="unfinished">撤销</translation> + <translation>撤销</translation> </message> <message> <location line="+1"/> <source>Select All</source> - <translation type="unfinished">全选</translation> + <translation>全选</translation> </message> <message> <location line="+1"/> <source>Clear Clipboard</source> - <translation type="unfinished">清空剪贴板</translation> + <translation>清空剪贴板</translation> </message> <message> <location line="+1"/> <source>Find in Files</source> - <translation type="unfinished">在文件中查找</translation> + <translation>在文件中查找</translation> </message> <message> <location line="+2"/> <source>Clear Command Window</source> - <translation type="unfinished">清空命令窗口</translation> + <translation>清空命令窗口</translation> </message> <message> <location line="+2"/> <source>Clear Command History</source> - <translation type="unfinished">清空命令历史</translation> + <translation>清空命令历史</translation> </message> <message> <location line="+2"/> <source>Clear Workspace</source> - <translation type="unfinished">清空工作空间</translation> + <translation>清空工作空间</translation> </message> <message> <location line="+1"/> <location line="+162"/> <source>Preferences</source> - <translation type="unfinished">首选项</translation> + <translation>首选项</translation> </message> <message> <location line="-159"/> <source>Step</source> - <translation type="unfinished">步骤</translation> + <translation>步骤</translation> </message> <message> <location line="+2"/> <source>Step Into</source> - <translation type="unfinished">步入</translation> + <translation>步入</translation> </message> <message> <location line="+2"/> <source>Step Out</source> - <translation type="unfinished">步出</translation> + <translation>步出</translation> </message> <message> <location line="+2"/> <source>Continue</source> - <translation type="unfinished">继续</translation> + <translation>继续</translation> </message> <message> <location line="+2"/> <source>Quit Debug Mode</source> - <translation type="unfinished">退出调试</translation> + <translation>退出调试</translation> </message> <message> <location line="+4"/> <source>Show Command Window</source> - <translation type="unfinished">显示命令窗口</translation> + <translation>显示命令窗口</translation> </message> <message> <location line="+2"/> <source>Show Command History</source> - <translation type="unfinished">显示命令历史</translation> + <translation>显示命令历史</translation> </message> <message> <location line="+2"/> <source>Show File Browser</source> - <translation type="unfinished">显示文件浏览器</translation> + <translation>显示文件浏览器</translation> </message> <message> <location line="+2"/> <source>Show Workspace</source> - <translation type="unfinished">显示工作空间</translation> + <translation>显示工作空间</translation> </message> <message> <location line="+2"/> <source>Show Editor</source> - <translation type="unfinished">显示编辑器</translation> + <translation>显示编辑器</translation> </message> <message> <location line="+2"/> <source>Show Documentation</source> - <translation type="unfinished">显示文档</translation> + <translation>显示文档</translation> </message> <message> <location line="+2"/> <source>Show Variable Editor</source> - <translation type="unfinished"></translation> + <translation>显示变量编辑器</translation> </message> <message> <location line="+2"/> <source>Command Window</source> - <translation type="unfinished">命令窗口</translation> + <translation>命令窗口</translation> </message> <message> <location line="+2"/> <source>Command History</source> - <translation type="unfinished">命令历史</translation> + <translation>命令历史</translation> </message> <message> <location line="+2"/> <source>File Browser</source> - <translation type="unfinished">文件浏览器</translation> + <translation>文件浏览器</translation> </message> <message> <location line="+2"/> <source>Workspace</source> - <translation type="unfinished">工作空间</translation> + <translation>工作空间</translation> </message> <message> <location line="+2"/> <location line="+258"/> <source>Editor</source> - <translation type="unfinished"> 编辑器</translation> + <translation>编辑器</translation> </message> <message> <location line="-256"/> <source>Documentation</source> - <translation type="unfinished">文档</translation> + <translation>文档</translation> </message> <message> <location line="+2"/> <source>Variable Editor</source> - <translation type="unfinished"></translation> + <translation>变量编辑器</translation> </message> <message> <location line="+2"/> <source>Reset Default Window Layout</source> - <translation type="unfinished">复位为默认窗口布局</translation> + <translation>复位为默认窗口布局</translation> </message> <message> <location line="+3"/> <source>Show Ondisk Documentation</source> - <translation type="unfinished">显示本地文档</translation> + <translation>显示本地文档</translation> </message> <message> <location line="+2"/> <source>Show Online Documentation</source> - <translation type="unfinished">显示在线文档</translation> + <translation>显示在线文档</translation> </message> <message> <location line="+2"/> <source>Report Bug</source> - <translation type="unfinished">报告问题</translation> + <translation>报告问题</translation> </message> <message> <location line="+1"/> <source>Octave Packages</source> - <translation type="unfinished">Octave 软件包</translation> + <translation>Octave 软件包</translation> </message> <message> <location line="+1"/> <source>Contribute to Octave</source> - <translation type="unfinished">贡献 Octave</translation> + <translation>贡献 Octave</translation> </message> <message> <location line="+1"/> <source>Octave Developer Resources</source> - <translation type="unfinished">Octave 开发者资源</translation> + <translation>Octave 开发者资源</translation> </message> <message> <location line="+2"/> <source>About Octave</source> - <translation type="unfinished">关于 Octave</translation> + <translation>关于 Octave</translation> </message> <message> <location line="+3"/> <source>Release Notes</source> - <translation type="unfinished">发行注记</translation> + <translation>发行注记</translation> </message> <message> <location line="+1"/> <source>Community News</source> - <translation type="unfinished">社区新闻</translation> + <translation>社区新闻</translation> </message> <message> <location line="+5"/> <source>Close Tab</source> - <translation type="unfinished"></translation> + <translation>关闭标签页</translation> </message> <message> <location line="+1"/> <source>Close All Tabs</source> - <translation type="unfinished"></translation> + <translation>关闭所有标签页</translation> </message> <message> <location line="+1"/> <source>Close Other Tabs</source> - <translation type="unfinished"></translation> + <translation>关闭其他标签页</translation> </message> <message> <location line="+1"/> <source>Switch to Left Tab</source> - <translation type="unfinished">切换到左侧标签页</translation> + <translation>切换到左侧标签页</translation> </message> <message> <location line="+2"/> <source>Switch to Right Tab</source> - <translation type="unfinished">切换到右侧标签页</translation> + <translation>切换到右侧标签页</translation> </message> <message> <location line="+2"/> <source>Move Tab Left</source> - <translation type="unfinished">向左移动标签页</translation> + <translation>向左移动标签页</translation> </message> <message> <location line="+2"/> <source>Move Tab Right</source> - <translation type="unfinished">向右移动标签页</translation> + <translation>向右移动标签页</translation> </message> <message> <location line="+6"/> <source>Edit Function</source> - <translation type="unfinished">编辑函数</translation> + <translation>编辑函数</translation> </message> <message> <location line="+2"/> <source>Save File</source> - <translation type="unfinished">保存文件</translation> + <translation>保存文件</translation> </message> <message> <location line="+1"/> <source>Save File As</source> - <translation type="unfinished">另存文件为</translation> + <translation>另存文件为</translation> </message> <message> <location line="+1"/> <source>Print</source> - <translation type="unfinished">打印</translation> + <translation>打印</translation> </message> <message> <location line="+3"/> <source>Redo</source> - <translation type="unfinished">撤销</translation> + <translation>撤销</translation> </message> <message> <location line="+1"/> <source>Cut</source> - <translation type="unfinished">剪切</translation> + <translation>剪切</translation> </message> <message> <location line="+1"/> <source>Find and Replace</source> - <translation type="unfinished">查找并替换</translation> + <translation>查找并替换</translation> </message> <message> <location line="+2"/> <source>Find Next</source> - <translation type="unfinished">查找下一个</translation> + <translation>查找下一个</translation> </message> <message> <location line="+2"/> <source>Find Previous</source> - <translation type="unfinished">查找上一个</translation> + <translation>查找上一个</translation> </message> <message> <location line="+2"/> <source>Delete to Start of Word</source> - <translation type="unfinished"></translation> + <translation>删除到单词开始</translation> </message> <message> <location line="+2"/> <source>Delete to End of Word</source> - <translation type="unfinished"></translation> + <translation>删除到单词结束</translation> </message> <message> <location line="+2"/> <source>Delete to Start of Line</source> - <translation type="unfinished"></translation> + <translation>删除到行的开始</translation> </message> <message> <location line="+2"/> <source>Delete to End of Line</source> - <translation type="unfinished"></translation> + <translation>删除到行的结束</translation> </message> <message> <location line="+2"/> <source>Delete Line</source> - <translation type="unfinished">删除行</translation> + <translation>删除行</translation> </message> <message> <location line="+2"/> <source>Copy Line</source> - <translation type="unfinished">复制行</translation> + <translation>复制行</translation> </message> <message> <location line="+2"/> <source>Cut Line</source> - <translation type="unfinished">剪切行</translation> + <translation>剪切行</translation> </message> <message> <location line="+2"/> <source>Duplicate Selection/Line</source> - <translation type="unfinished"></translation> + <translation>重复选择的文本/行</translation> </message> <message> <location line="+2"/> <source>Transpose Line</source> - <translation type="unfinished">交换行</translation> + <translation>交换行</translation> </message> <message> <location line="+2"/> <source>Show Completion List</source> - <translation type="unfinished">显示补全列表</translation> + <translation>显示补全列表</translation> </message> <message> <location line="+3"/> <source>Comment Selection</source> - <translation type="unfinished">注释选择的文本</translation> + <translation>注释选择的文本</translation> </message> <message> <location line="+2"/> <source>Uncomment Selection</source> - <translation type="unfinished">取消选择的文本的注释</translation> + <translation>取消选择的文本的注释</translation> </message> <message> <location line="+2"/> <source>Comment Selection (Choosing String)</source> - <translation type="unfinished"></translation> + <translation>注释所选(正在选择字符串)</translation> </message> <message> <location line="+2"/> <source>Uppercase Selection</source> - <translation type="unfinished">将选择的文本大写</translation> + <translation>将选择的文本大写</translation> </message> <message> <location line="+2"/> <source>Lowercase Selection</source> - <translation type="unfinished">将选择的文本小写</translation> + <translation>将选择的文本小写</translation> </message> <message> <location line="+4"/> <location line="+5"/> <source>Indent Selection Rigidly</source> - <translation type="unfinished"></translation> + <translation>严格缩进所选</translation> </message> <message> <location line="-3"/> <location line="+5"/> <source>Unindent Selection Rigidly</source> - <translation type="unfinished"></translation> + <translation>严格向左缩进</translation> </message> <message> <location line="+3"/> <source>Indent Code</source> - <translation type="unfinished"></translation> + <translation>缩进代码</translation> </message> <message> <location line="+3"/> <source>Convert Line Endings to Windows</source> - <translation type="unfinished">将行结束符转换为Windows样式</translation> + <translation>将行结束符转换为Windows样式</translation> </message> <message> <location line="+2"/> <source>Convert Line Endings to Unix</source> - <translation type="unfinished">将行结束符转换为Unix样式</translation> + <translation>将行结束符转换为Unix样式</translation> </message> <message> <location line="+2"/> <source>Convert Line Endings to Mac</source> - <translation type="unfinished">将行结束符转换为Mac样式</translation> + <translation>将行结束符转换为Mac样式</translation> </message> <message> <location line="+3"/> <source>Goto Line</source> - <translation type="unfinished">转到行</translation> + <translation>转到行</translation> </message> <message> <location line="+2"/> <source>Move to Matching Brace</source> - <translation type="unfinished">移至匹配的括号</translation> + <translation>移至匹配的括号</translation> </message> <message> <location line="+2"/> <source>Select to Matching Brace</source> - <translation type="unfinished"></translation> + <translation>选择匹配的括号间的文本</translation> </message> <message> <location line="+2"/> <source>Toggle Bookmark</source> - <translation type="unfinished">切换书签</translation> + <translation>切换书签</translation> </message> <message> <location line="+2"/> <source>Next Bookmark</source> - <translation type="unfinished">下一个书签</translation> + <translation>下一个书签</translation> </message> <message> <location line="+2"/> <source>Previous Bookmark</source> - <translation type="unfinished">上一个书签</translation> + <translation>上一个书签</translation> </message> <message> <location line="+2"/> <source>Remove All Bookmark</source> - <translation type="unfinished">移除所有书签</translation> + <translation>移除所有书签</translation> </message> <message> <location line="+4"/> <source>Styles Preferences</source> - <translation type="unfinished">样式首选项</translation> + <translation>样式首选项</translation> </message> <message> <location line="+4"/> <source>Show Line Numbers</source> - <translation type="unfinished">显示行号</translation> + <translation>显示行号</translation> </message> <message> <location line="+2"/> <source>Show Whitespace Characters</source> - <translation type="unfinished">显示空白字符</translation> + <translation>显示空白字符</translation> </message> <message> <location line="+2"/> <source>Show Line Endings</source> - <translation type="unfinished">显示行结束符</translation> + <translation>显示行结束符</translation> </message> <message> <location line="+1"/> <source>Show Indentation Guides</source> - <translation type="unfinished">显示缩进对齐线</translation> + <translation>显示缩进对齐线</translation> </message> <message> <location line="+2"/> <source>Show Long Line Marker</source> - <translation type="unfinished">显示长线标记</translation> + <translation>显示长线标记</translation> </message> <message> <location line="+2"/> <source>Show Toolbar</source> - <translation type="unfinished">显示工具栏</translation> + <translation>显示工具栏</translation> </message> <message> <location line="+2"/> <source>Show Statusbar</source> - <translation type="unfinished">显示状态栏</translation> + <translation>显示状态栏</translation> </message> <message> <location line="+2"/> <source>Show Horizontal Scrollbar</source> - <translation type="unfinished">显示水平滚动条</translation> + <translation>显示水平滚动条</translation> </message> <message> <location line="+2"/> <source>Zoom In</source> - <translation type="unfinished">放大</translation> + <translation>放大</translation> </message> <message> <location line="+1"/> <source>Zoom Out</source> - <translation type="unfinished">缩小</translation> + <translation>缩小</translation> </message> <message> <location line="+2"/> <location line="+3"/> <source>Zoom Normal</source> - <translation type="unfinished">缩放正常</translation> + <translation>缩放正常</translation> </message> <message> <location line="+5"/> <source>Toggle Breakpoint</source> - <translation type="unfinished">切换断点</translation> + <translation>切换断点</translation> </message> <message> <location line="+2"/> <source>Next Breakpoint</source> - <translation type="unfinished">下一个断点</translation> + <translation>下一个断点</translation> </message> <message> <location line="+2"/> <source>Previous Breakpoint</source> - <translation type="unfinished">上一个断点</translation> + <translation>上一个断点</translation> </message> <message> <location line="+2"/> <source>Remove All Breakpoints</source> - <translation type="unfinished">移除所有断点</translation> + <translation>移除所有断点</translation> </message> <message> <location line="+4"/> <source>Run File</source> - <translation type="unfinished">运行文件</translation> + <translation>运行文件</translation> </message> <message> <location line="+2"/> <source>Run Selection</source> - <translation type="unfinished">运行所选</translation> + <translation>运行所选</translation> </message> <message> <location line="+4"/> <source>Help on Keyword</source> - <translation type="unfinished">关键字帮助</translation> + <translation>关键字帮助</translation> </message> <message> <location line="+2"/> <source>Document on Keyword</source> - <translation type="unfinished">关键字文档</translation> + <translation>关键字文档</translation> </message> <message> <location line="+57"/> <source>Global</source> - <translation type="unfinished">全局</translation> + <translation>全局</translation> </message> <message> <location line="+3"/> <location line="+27"/> <source>File Menu</source> - <translation type="unfinished"></translation> + <translation>文件菜单</translation> </message> <message> <location line="-25"/> <location line="+27"/> <source>Edit Menu</source> - <translation type="unfinished"></translation> + <translation>编辑菜单</translation> </message> <message> <location line="-25"/> <location line="+29"/> <source>Debug Menu</source> - <translation type="unfinished"></translation> + <translation>调试菜单</translation> </message> <message> <location line="-27"/> <source>Window Menu</source> - <translation type="unfinished"></translation> + <translation>窗口菜单</translation> </message> <message> <location line="+2"/> <location line="+29"/> <source>Help Menu</source> - <translation type="unfinished"></translation> + <translation>帮助目录</translation> </message> <message> <location line="-27"/> <source>News Menu</source> - <translation type="unfinished"></translation> + <translation>新闻目录</translation> </message> <message> <location line="+2"/> <source>Tab Handling in Dock Widgets</source> - <translation type="unfinished"></translation> + <translation>标签页正在停靠组件中处理</translation> </message> <message> <location line="+19"/> <source>View Menu</source> - <translation type="unfinished"></translation> + <translation>视图菜单</translation> </message> <message> <location line="+4"/> <source>Run Menu</source> - <translation type="unfinished"></translation> + <translation>运行菜单</translation> </message> <message> <location line="+68"/> <source>Import shortcuts from file ...</source> - <translation type="unfinished"></translation> + <translation>从文件导入快捷键 ...</translation> </message> <message> <location line="+5"/> <source>Export shortcuts into file ...</source> - <translation type="unfinished"></translation> + <translation>导出快捷键到文件 ...</translation> </message> <message> <location line="-4"/> <location line="+5"/> <source>Octave Shortcut Files (*.osc);;All Files (*)</source> - <translation type="unfinished">Octave 快捷键文件 (*.osc);;全部文件 (*)</translation> + <translation>Octave 快捷键文件 (*.osc);;全部文件 (*)</translation> </message> <message> <location line="+10"/> <source>Failed to open %1 as octave shortcut file</source> - <translation type="unfinished">无法将 %1 作为 Octave 快捷键文件打开</translation> + <translation>无法将 %1 作为 Octave 快捷键文件打开</translation> </message> <message> <location line="+26"/> <source>Enter new Shortcut</source> - <translation type="unfinished">输入一个新的快捷键</translation> + <translation>输入一个新的快捷键</translation> </message> <message> <location line="+4"/> <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source> - <translation type="unfinished">应用所需的快捷方式或单击右键以将快捷方式重置为其默认值。</translation> + <translation>应用所需的快捷方式或单击右键以将快捷方式重置为其默认值。</translation> </message> <message> <location line="+7"/> <source>Enter shortcut directly by performing it</source> - <translation type="unfinished">通过执行直接输入快捷方式</translation> + <translation>通过执行直接输入快捷方式</translation> </message> <message> <location line="+6"/> <source>Actual shortcut</source> - <translation type="unfinished">当前快捷键</translation> + <translation>当前快捷键</translation> </message> <message> <location line="+6"/> <source>Default shortcut</source> - <translation type="unfinished">默认快捷键</translation> + <translation>默认快捷键</translation> </message> <message> <location line="+6"/> <source>Set to default</source> - <translation type="unfinished">设为默认值</translation> + <translation>设为默认值</translation> </message> <message> <location line="+63"/> <source>Overwriting Shortcuts</source> - <translation type="unfinished">覆盖快捷键</translation> + <translation>覆盖快捷键</translation> </message> <message> <location line="+2"/> <source>You are about to overwrite all shortcuts. Would you like to save the current shortcut set or cancel the action?</source> - <translation type="unfinished">您即将覆盖所有快捷键。 + <translation>您即将覆盖所有快捷键。 你想保存当前的快捷键设置还是取消操作？</translation> </message> <message> <location line="+3"/> <source>Don't save</source> - <translation type="unfinished">不保存 ('t)</translation> + <translation>不保存 ('t)</translation> </message> </context> <context> @@ -3754,7 +3811,7 @@ <message> <location filename="../src/terminal-dock-widget.cc" line="+43"/> <source>Command Window</source> - <translation type="unfinished">命令窗口</translation> + <translation>命令窗口</translation> </message> </context> <context> @@ -3762,22 +3819,22 @@ <message> <location filename="../src/variable-editor.cc" line="+177"/> <source>Dock widget</source> - <translation type="unfinished">停靠组件</translation> + <translation>停靠组件</translation> </message> <message> <location line="+8"/> <source>Undock widget</source> - <translation type="unfinished">取消组件停靠</translation> + <translation>取消组件停靠</translation> </message> <message> <location line="+17"/> <source>Restore geometry</source> - <translation type="unfinished"></translation> + <translation>恢复窗口几何形状</translation> </message> <message> <location line="+3"/> <source>Redock</source> - <translation type="unfinished"></translation> + <translation>重新停靠</translation> </message> </context> <context> @@ -3785,119 +3842,119 @@ <message> <location line="+792"/> <source>Variable Editor</source> - <translation type="unfinished"></translation> + <translation>变量编辑器</translation> </message> <message> <location line="+1"/> <source>Edit variables.</source> - <translation type="unfinished"></translation> + <translation>编辑变量。</translation> </message> <message> <location line="+259"/> <source>Foreground</source> - <translation type="unfinished"></translation> + <translation>前景</translation> </message> <message> <location line="+1"/> <source>Background</source> - <translation type="unfinished">背景</translation> + <translation>背景</translation> </message> <message> <location line="+1"/> <source>Selected Foreground</source> - <translation type="unfinished"></translation> + <translation>选择的前景</translation> </message> <message> <location line="+1"/> <source>Selected Background</source> - <translation type="unfinished"></translation> + <translation>选择的背景</translation> </message> <message> <location line="+1"/> <source>Alternate Background</source> - <translation type="unfinished"></translation> + <translation>交替的背景</translation> </message> <message> <location line="+255"/> <source>Variable Editor Toolbar</source> - <translation type="unfinished"></translation> + <translation>变量编辑器工具栏</translation> </message> <message> <location line="+4"/> <source>Save</source> - <translation type="unfinished"></translation> + <translation>保存</translation> </message> <message> <location line="+2"/> <source>Save variable to a file</source> - <translation type="unfinished"></translation> + <translation>保存变量到文件</translation> </message> <message> <location line="+5"/> <source>Cut</source> - <translation type="unfinished">剪切</translation> + <translation>剪切</translation> </message> <message> <location line="+1"/> <source>Cut data to clipboard</source> - <translation type="unfinished"></translation> + <translation>剪切到剪切板</translation> </message> <message> <location line="+3"/> <source>Copy</source> - <translation type="unfinished">复制</translation> + <translation>复制</translation> </message> <message> <location line="+1"/> <source>Copy data to clipboard</source> - <translation type="unfinished"></translation> + <translation>复制到剪切板</translation> </message> <message> <location line="+3"/> <source>Paste</source> - <translation type="unfinished">粘贴</translation> + <translation>粘贴</translation> </message> <message> <location line="+1"/> <source>Paste clipboard into variable data</source> - <translation type="unfinished"></translation> + <translation>粘贴剪切板到变量中</translation> </message> <message> <location line="+5"/> <source>Paste Table</source> - <translation type="unfinished"></translation> + <translation>粘贴表格</translation> </message> <message> <location line="+2"/> <source>Another paste clipboard into variable data</source> - <translation type="unfinished"></translation> + <translation>另一个将剪贴板粘贴到变量中</translation> </message> <message> <location line="+9"/> <location line="+5"/> <location line="+7"/> <source>Plot</source> - <translation type="unfinished"></translation> + <translation>绘制</translation> </message> <message> <location line="-11"/> <source>Plot Selected Data</source> - <translation type="unfinished"></translation> + <translation>绘制所选数据</translation> </message> <message> <location line="+5"/> <source>Plot selected data</source> - <translation type="unfinished"></translation> + <translation>绘制所选数据</translation> </message> <message> <location line="+21"/> <source>Up</source> - <translation type="unfinished"></translation> + <translation>上</translation> </message> <message> <location line="+1"/> <source>Go one level up in variable hierarchy</source> - <translation type="unfinished"></translation> + <translation>前往变量的上一级结点</translation> </message> </context> <context> @@ -3905,7 +3962,7 @@ <message> <location line="-1219"/> <source>Save Variable %1 As</source> - <translation type="unfinished"></translation> + <translation>保存变量 %1 为</translation> </message> </context> <context> @@ -3913,42 +3970,42 @@ <message> <location line="+126"/> <source>Cut</source> - <translation type="unfinished">剪切</translation> + <translation>剪切</translation> </message> <message> <location line="+4"/> <source>Copy</source> - <translation type="unfinished">复制</translation> + <translation>复制</translation> </message> <message> <location line="+4"/> <source>Paste</source> - <translation type="unfinished">粘贴</translation> + <translation>粘贴</translation> </message> <message> <location line="+6"/> <source>Paste Table</source> - <translation type="unfinished"></translation> + <translation>粘贴表格</translation> </message> <message> <location line="+6"/> <source>Clear</source> - <translation type="unfinished"></translation> + <translation>清空</translation> </message> <message> <location line="+4"/> <source>Delete</source> - <translation type="unfinished">删除</translation> + <translation>删除</translation> </message> <message> <location line="+4"/> <source>Variable from Selection</source> - <translation type="unfinished"></translation> + <translation>所选变量</translation> </message> <message> <location line="+18"/> <source>Transpose</source> - <translation type="unfinished"></translation> + <translation>转置</translation> </message> </context> <context> @@ -3956,32 +4013,32 @@ <message> <location filename="../src/qtinfo/webinfo.cc" line="+85"/> <source>Type here and press 'Return' to search</source> - <translation type="unfinished">在这里输入并按下回车以搜索</translation> + <translation>在这里输入并按下回车以搜索</translation> </message> <message> <location line="+4"/> <source>Global search</source> - <translation type="unfinished">全局搜索</translation> + <translation>全局搜索</translation> </message> <message> <location line="+4"/> <source>&Close</source> - <translation type="unfinished">关闭 (&C)</translation> + <translation>关闭 (&C)</translation> </message> <message> <location line="+3"/> <source>Close &Other Tabs</source> - <translation type="unfinished"></translation> + <translation>关闭其他标签页 (&O)</translation> </message> <message> <location line="+79"/> <source>Error</source> - <translation type="unfinished">错误</translation> + <translation>错误</translation> </message> <message> <location line="+3"/> <source>The info file<p>%1<p>or compressed versions do not exist</source> - <translation type="unfinished">信息文件<p>%1<p>或者压缩版本不存在</translation> + <translation>信息文件<p>%1<p>或者压缩版本不存在</translation> </message> </context> <context> @@ -3989,7 +4046,7 @@ <message> <location filename="../src/welcome-wizard.cc" line="-162"/> <source>Welcome to GNU Octave</source> - <translation type="unfinished">欢迎来到 GNU Octave</translation> + <translation>欢迎来到 GNU Octave</translation> </message> </context> <context> @@ -3997,38 +4054,38 @@ <message> <location filename="../src/workspace-model.cc" line="-41"/> <source>Name</source> - <translation type="unfinished">名称</translation> + <translation>名称</translation> </message> <message> <location line="+1"/> <source>Class</source> - <translation type="unfinished">类</translation> + <translation>类</translation> </message> <message> <location line="+1"/> <source>Dimension</source> - <translation type="unfinished">维度</translation> + <translation>维度</translation> </message> <message> <location line="+1"/> <source>Value</source> - <translation type="unfinished">值</translation> + <translation>值</translation> </message> <message> <location line="+1"/> <source>Attribute</source> - <translation type="unfinished">属性</translation> + <translation>属性</translation> </message> <message> <location line="+108"/> <source>Right click to copy, rename, or display</source> - <translation type="unfinished">右击以复制，重命名或显示</translation> + <translation>右击以复制，重命名或显示</translation> </message> <message> <location line="+37"/> <location line="+2"/> <source>complex</source> - <translation type="unfinished">复杂度</translation> + <translation>复杂度</translation> </message> </context> <context> @@ -4036,87 +4093,87 @@ <message> <location filename="../src/workspace-view.cc" line="+55"/> <source>Workspace</source> - <translation type="unfinished">工作空间</translation> + <translation>工作空间</translation> </message> <message> <location line="+1"/> <source>View the variables in the active workspace.</source> - <translation type="unfinished">显示当前活动工作区的变量。</translation> + <translation>显示当前活动工作区的变量。</translation> </message> <message> <location line="+3"/> <source>Enter text to filter the workspace</source> - <translation type="unfinished">输入文本以过滤工作区</translation> + <translation>输入文本以过滤工作区</translation> </message> <message> <location line="+9"/> <source>Filter</source> - <translation type="unfinished">过滤器</translation> + <translation>过滤器</translation> </message> <message> <location line="+130"/> <source>View the variables in the active workspace.<br></source> - <translation type="unfinished">显示当前活动工作区的变量。<br></translation> + <translation>显示当前活动工作区的变量。<br></translation> </message> <message> <location line="+1"/> <source>Colors for variable attributes:</source> - <translation type="unfinished">变量属性的颜色:</translation> + <translation>变量属性的颜色:</translation> </message> <message> <location line="+13"/> <source>Class</source> - <translation type="unfinished">类</translation> + <translation>类</translation> </message> <message> <location line="+1"/> <source>Dimension</source> - <translation type="unfinished">维度</translation> + <translation>维度</translation> </message> <message> <location line="+1"/> <source>Value</source> - <translation type="unfinished">值</translation> + <translation>值</translation> </message> <message> <location line="+1"/> <source>Attribute</source> - <translation type="unfinished">属性</translation> + <translation>属性</translation> </message> <message> <location line="+136"/> <source>Open in Variable Editor</source> - <translation type="unfinished"></translation> + <translation>在变量编辑器中打开</translation> </message> <message> <location line="+3"/> <source>Copy name</source> - <translation type="unfinished">复制变量名</translation> + <translation>复制变量名</translation> </message> <message> <location line="+3"/> <source>Copy value</source> - <translation type="unfinished">复制变量值</translation> + <translation>复制变量值</translation> </message> <message> <location line="+3"/> <source>Rename</source> - <translation type="unfinished">重命名</translation> + <translation>重命名</translation> </message> <message> <location line="+9"/> <source>Only top-level symbols may be renamed</source> - <translation type="unfinished">只有顶级符号可能会被重命名</translation> + <translation>只有顶级符号可能会被重命名</translation> </message> <message> <location line="+22"/> <source>Hide filter</source> - <translation type="unfinished">隐藏过滤器</translation> + <translation>隐藏过滤器</translation> </message> <message> <location line="+3"/> <source>Show filter</source> - <translation type="unfinished">显示过滤器</translation> + <translation>显示过滤器</translation> </message> </context> <context> @@ -4135,17 +4192,17 @@ <message> <location line="-457"/> <source>Interface</source> - <translation type="unfinished">接口</translation> + <translation>接口</translation> </message> <message> <location line="+259"/> <source>Dock widget title bar</source> - <translation type="unfinished">停靠组件标题栏</translation> + <translation>停靠组件标题栏</translation> </message> <message> <location line="-176"/> <source>Confirm before exiting</source> - <translation type="unfinished">退出前确认</translation> + <translation>退出前确认</translation> </message> <message> <location line="+188"/> @@ -4161,65 +4218,65 @@ <location line="+36"/> <location line="+280"/> <source>Show status bar</source> - <translation type="unfinished">显示状态栏</translation> + <translation>显示状态栏</translation> </message> <message> <location line="-458"/> <source>Text inactive</source> - <translation type="unfinished">不活动的文本</translation> + <translation>不活动的文本</translation> </message> <message> <location line="-32"/> <location line="+45"/> <source>Active</source> - <translation type="unfinished">活动</translation> + <translation>活动</translation> </message> <message> <location line="-142"/> <source>Small</source> - <translation type="unfinished">小</translation> + <translation>小</translation> </message> <message> <location line="+17"/> <source>Large</source> - <translation type="unfinished">大</translation> + <translation>大</translation> </message> <message> <location line="+151"/> <source>Custom style</source> - <translation type="unfinished">自定义样式</translation> + <translation>自定义样式</translation> </message> <message> <location line="+13"/> <source>Background inactive</source> - <translation type="unfinished">不活动的背景</translation> + <translation>不活动的背景</translation> </message> <message> <location line="+19"/> <source>3D</source> - <translation type="unfinished">3D</translation> + <translation>3D</translation> </message> <message> <location line="+132"/> <source>Octave Startup</source> - <translation type="unfinished">Octave 启动</translation> + <translation>Octave 启动</translation> </message> <message> <location line="+41"/> <location line="+1732"/> <source>Startup path</source> - <translation type="unfinished">启动路径</translation> + <translation>启动路径</translation> </message> <message> <location line="-1719"/> <location line="+1712"/> <source>Browse</source> - <translation type="unfinished">浏览</translation> + <translation>浏览</translation> </message> <message> <location line="-1672"/> <source>Editor</source> - <translation> 编辑器</translation> + <translation>编辑器</translation> </message> <message> <location line="+314"/> @@ -4229,53 +4286,53 @@ <message> <location line="-277"/> <source>Tab width min.</source> - <translation type="unfinished">Tab 最小宽度.</translation> + <translation>Tab 最小宽度.</translation> </message> <message> <location line="+70"/> <source>max.</source> - <translation type="unfinished">最大.</translation> + <translation>最大.</translation> </message> <message> <location line="+422"/> <location line="+140"/> <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source> - <translation type="unfinished">这适用于等宽字体。 该线根据默认字体中空格字符的宽度绘制。 如果样式使用比例字体，或者使用不同的字体大小或粗体，斜体和普通文本，它可能无法很好地工作。</translation> + <translation>这适用于等宽字体。 该线根据默认字体中空格字符的宽度绘制。 如果样式使用比例字体，或者使用不同的字体大小或粗体，斜体和普通文本，它可能无法很好地工作。</translation> </message> <message> <location line="-463"/> <source>Enable Code Folding</source> - <translation type="unfinished">启用代码折叠</translation> + <translation>启用代码折叠</translation> </message> <message> <location line="+961"/> <source>Windows (CRLF)</source> - <translation type="unfinished">Windows (CRLF)</translation> + <translation>Windows (CRLF)</translation> </message> <message> <location line="+5"/> <source>Mac (CR)</source> - <translation type="unfinished">Mac (CR)</translation> + <translation>Mac (CR)</translation> </message> <message> <location line="+5"/> <source>Unix (LF)</source> - <translation type="unfinished">Unix (LF)</translation> + <translation>Unix (LF)</translation> </message> <message> <location line="-936"/> <source>Show horizontal scroll bar</source> - <translation type="unfinished">显示水平滚动条</translation> + <translation>显示水平滚动条</translation> </message> <message> <location line="-19"/> <source>Show tool bar</source> - <translation type="unfinished">显示工具栏</translation> + <translation>显示工具栏</translation> </message> <message> <location line="+465"/> <source>Indentation</source> - <translation type="unfinished">缩进</translation> + <translation>缩进</translation> </message> <message> <location line="+40"/> @@ -4310,12 +4367,12 @@ <message> <location line="+23"/> <source>Indentation uses tabs</source> - <translation type="unfinished">使用 tabs 缩进</translation> + <translation>使用 tabs 缩进</translation> </message> <message> <location line="+70"/> <source>Auto completion</source> - <translation type="unfinished">自动补全</translation> + <translation>自动补全</translation> </message> <message> <location line="+27"/> @@ -4340,22 +4397,22 @@ <message> <location line="+48"/> <source>With Octave builtins</source> - <translation type="unfinished">Octave 内建</translation> + <translation>Octave 内置</translation> </message> <message> <location line="+10"/> <source>With Octave functions</source> - <translation type="unfinished">Octave 函数</translation> + <translation>Octave 函数</translation> </message> <message> <location line="+64"/> <source>Show completion list automatically</source> - <translation type="unfinished">自动显示补全列表</translation> + <translation>自动显示补全列表</translation> </message> <message> <location line="+50"/> <source>Reload externally changed files without prompt</source> - <translation type="unfinished">无需提示即可重新加载外部更改的文件</translation> + <translation>无需提示即可重新加载外部更改的文件</translation> </message> <message> <location line="-712"/> @@ -4365,7 +4422,7 @@ <message> <location line="+805"/> <source>Text encoding used for loading and saving</source> - <translation type="unfinished">文本编码用于加载和保存</translation> + <translation>文本编码用于加载和保存</translation> </message> <message> <location line="+63"/> @@ -4375,22 +4432,22 @@ <message> <location line="+202"/> <source>(Changing buffer size clears history)</source> - <translation type="unfinished">(更改缓冲区大小清除历史记录)</translation> + <translation>(更改缓冲区大小清除历史记录)</translation> </message> <message> <location line="+28"/> <source>History buffer Size</source> - <translation type="unfinished">历史缓冲区大小</translation> + <translation>历史缓冲区大小</translation> </message> <message> <location line="+27"/> <source>Set focus to terminal when running a command from within another widget</source> - <translation type="unfinished">从另一个组件中运行命令时，将焦点设置为终端</translation> + <translation>从另一个组件中运行命令时，将焦点设置为终端</translation> </message> <message> <location line="+7"/> <source>Print debug location in terminal window in addition to the marker in the editor</source> - <translation type="unfinished">除了编辑器中的标记之外，还可以在终端窗口中打印调试位置</translation> + <translation>除了编辑器中的标记之外，还可以在终端窗口中打印调试位置</translation> </message> <message> <location line="+16"/> @@ -4421,12 +4478,12 @@ <message> <location line="+60"/> <source>These preferences are applied after any .octaverc startup files.</source> - <translation type="unfinished">这些首选项在任何.octaverc启动文件之后应用。</translation> + <translation>这些首选项在任何.octaverc启动文件之后应用。</translation> </message> <message> <location line="+55"/> <source>Restore working directory of previous session</source> - <translation type="unfinished">恢复前一个会话的工作目录</translation> + <translation>恢复前一个会话的工作目录</translation> </message> <message> <location line="+226"/> @@ -4441,17 +4498,17 @@ <message> <location line="+215"/> <source>Show EOL characters</source> - <translation type="unfinished">显示 EOL 字符</translation> + <translation>显示 EOL 字符</translation> </message> <message> <location line="+784"/> <source>Default EOL mode</source> - <translation type="unfinished">默认 EOL 模式</translation> + <translation>默认 EOL 模式</translation> </message> <message> <location line="-136"/> <source>Number of characters before list is shown: </source> - <translation type="unfinished">显示列表前的字符数:</translation> + <translation>显示列表前的字符数: </translation> </message> <message> <location line="+124"/> @@ -4461,12 +4518,12 @@ <message> <location line="-728"/> <source>command line (%f=file, %l=line):</source> - <translation>命令行 (%f=文件, %l=行数): </translation> + <translation>命令行 (%f=文件, %l=行数):</translation> </message> <message> <location line="+875"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).</p></body></html></source> - <translation type="unfinished"><html><head/><body><p>选择字体, 字体大小 (作为与默认大小的差异), 字体样式 (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), 文本颜色, 和背景颜色 (对于后者，颜色洋红色(255,0,255)是默认背景颜色的占位符).</p></body></html></translation> + <translation><html><head/><body><p>选择字体, 字体大小 (作为与默认大小的差异), 字体样式 (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), 文本颜色, 和背景颜色 (对于后者，颜色洋红色(255,0,255)是默认背景颜色的占位符).</p></body></html></translation> </message> <message> <location line="+32"/> @@ -4476,7 +4533,7 @@ <message> <location line="+44"/> <source>Cursor type:</source> - <translation>光标类型: </translation> + <translation>光标类型:</translation> </message> <message> <location line="-1467"/> @@ -4486,102 +4543,102 @@ <message> <location line="+231"/> <source>Show complete path in title</source> - <translation type="unfinished"></translation> + <translation>在窗口标题显示完整路径</translation> </message> <message> <location line="+131"/> <source>Number size as difference to editor font</source> - <translation type="unfinished"></translation> + <translation>数字大小与编辑器字体的差异</translation> </message> <message> <location line="+124"/> <source>Highlight all occurrences of a word selected by a double click</source> - <translation type="unfinished"></translation> + <translation>通过双击高亮所选单词所有出现处</translation> </message> <message> <location line="+65"/> <source>Comments (Octave)</source> - <translation type="unfinished"></translation> + <translation>注释 (Octave)</translation> </message> <message> <location line="+11"/> <source>Strings considered for uncommenting text</source> - <translation type="unfinished"></translation> + <translation>考虑取消注释文本的字符串</translation> </message> <message> <location line="+23"/> <source>String used for commenting selected text</source> - <translation type="unfinished"></translation> + <translation>用于注释选定文本的字符串</translation> </message> <message> <location line="+31"/> <source>Long lines</source> - <translation type="unfinished"></translation> + <translation>长行</translation> </message> <message> <location line="+25"/> <source>Break long lines at line length</source> - <translation type="unfinished"></translation> + <translation>在一行长度处断开长行</translation> </message> <message> <location line="+13"/> <source>Break lines only in comments</source> - <translation type="unfinished"></translation> + <translation>只在注释中断行</translation> </message> <message> <location line="+60"/> <source>Line length</source> - <translation type="unfinished"></translation> + <translation>线长</translation> </message> <message> <location line="+9"/> <source>Long line marker</source> - <translation type="unfinished"></translation> + <translation>长线标记</translation> </message> <message> <location line="+10"/> <source>Line</source> - <translation type="unfinished"></translation> + <translation>线</translation> </message> <message> <location line="+10"/> <source>Background</source> - <translation type="unfinished">背景</translation> + <translation>背景</translation> </message> <message> <location line="+38"/> <source>Wrap long lines at current window border</source> - <translation type="unfinished"></translation> + <translation>在当前的窗口边框处换行</translation> </message> <message> <location line="+153"/> <source>Auto insert after "if" etc.</source> - <translation type="unfinished"></translation> + <translation>自动在"if"等后插入.</translation> </message> <message> <location line="+20"/> <source>Nothing</source> - <translation type="unfinished"></translation> + <translation>无</translation> </message> <message> <location line="+5"/> <source>"endif" etc.</source> - <translation type="unfinished"></translation> + <translation>"endif" 等.</translation> </message> <message> <location line="+5"/> <source>"end"</source> - <translation type="unfinished"></translation> + <translation>"end"</translation> </message> <message> <location line="+267"/> <source>Restore editor tabs from previous session on startup or when editor is shown again after closing</source> - <translation type="unfinished"></translation> + <translation>在启动时或者当编辑器关闭后再次显示时，恢复上次会话的编辑器标签</translation> </message> <message> <location line="+105"/> <source>Close all files when the editor widget is closed/hidden</source> - <translation type="unfinished"></translation> + <translation>当编辑器组件关闭/隐藏时关闭所有文件</translation> </message> <message> <location line="+120"/> @@ -4607,43 +4664,43 @@ <message> <location line="+35"/> <source>Colors for variable attributes</source> - <translation type="unfinished">变量属性的颜色</translation> + <translation>变量属性的颜色</translation> </message> <message> <location line="+7"/> <source>Hide tool tips</source> - <translation type="unfinished">隐藏工具提示</translation> + <translation>隐藏工具提示</translation> </message> <message> <location line="+101"/> <source>Import shortcut set</source> - <translation type="unfinished">导入快捷键设置</translation> + <translation>导入快捷键设置</translation> </message> <message> <location line="+10"/> <source>Export current shortcut set</source> - <translation type="unfinished">导出当前快捷键设置</translation> + <translation>导出当前快捷键设置</translation> </message> <message> <location line="+10"/> <source>Reset shortcuts to their defaults</source> - <translation type="unfinished">将快捷方式重置为其默认值</translation> + <translation>将快捷方式重置为其默认值</translation> </message> <message> <location line="+3"/> <location line="+80"/> <source>Default</source> - <translation type="unfinished">默认</translation> + <translation>默认</translation> </message> <message> <location line="-71"/> <source>Edit a shortcut by double-clicking in a cell</source> - <translation type="unfinished">通过双击单元格编辑快捷方式</translation> + <translation>通过双击单元格编辑快捷方式</translation> </message> <message> <location line="+76"/> <source>Actual</source> - <translation type="unfinished">当前</translation> + <translation>当前</translation> </message> <message> <location line="+17"/> @@ -4663,52 +4720,52 @@ <message> <location line="+90"/> <source>Variable Editor</source> - <translation type="unfinished"></translation> + <translation>变量编辑器</translation> </message> <message> <location line="+43"/> <source>Plus font height</source> - <translation type="unfinished"></translation> + <translation>增加字体高度</translation> </message> <message> <location line="+10"/> <source>Default row height</source> - <translation type="unfinished"></translation> + <translation>默认行高</translation> </message> <message> <location line="+17"/> <source>Default column width</source> - <translation type="unfinished"></translation> + <translation>默认列宽</translation> </message> <message> <location line="+10"/> <source>Use Terminal Font</source> - <translation type="unfinished"></translation> + <translation>使用终端字体</translation> </message> <message> <location line="+26"/> <source>Autofit</source> - <translation type="unfinished"></translation> + <translation>自适应</translation> </message> <message> <location line="+14"/> <source>By Column</source> - <translation type="unfinished"></translation> + <translation>按列</translation> </message> <message> <location line="+5"/> <source>Uniform</source> - <translation type="unfinished"></translation> + <translation>等距</translation> </message> <message> <location line="+40"/> <source>Variable Editor Colors</source> - <translation type="unfinished"></translation> + <translation>变量编辑器颜色</translation> </message> <message> <location line="+12"/> <source>Use alternating row colors</source> - <translation type="unfinished"></translation> + <translation>使用颜色交替的行</translation> </message> <message> <location line="-290"/> @@ -4733,17 +4790,17 @@ <message> <location line="-56"/> <source>Normal</source> - <translation type="unfinished">正常</translation> + <translation>正常</translation> </message> <message> <location line="+1509"/> <source>File handling</source> - <translation type="unfinished">文件处理</translation> + <translation>文件处理</translation> </message> <message> <location line="+526"/> <source>Behavior</source> - <translation type="unfinished">行为</translation> + <translation>行为</translation> </message> <message> <location line="+8"/> @@ -4753,37 +4810,37 @@ <message> <location line="+22"/> <source>Restore last directory of previous session</source> - <translation type="unfinished">恢复前一个会话的最后一个目录</translation> + <translation>恢复前一个会话的最后一个目录</translation> </message> <message> <location line="+162"/> <source>Shortcuts</source> - <translation type="unfinished">快捷键</translation> + <translation>快捷键</translation> </message> <message> <location line="+31"/> <source>Select this option to prevent conflicts with readline shortcuts</source> - <translation type="unfinished">选择此选项可防止与readline快捷方式冲突</translation> + <translation>选择此选项可防止与readline快捷方式冲突</translation> </message> <message> <location line="+3"/> <source>Disable global shortcuts when terminal window has focus</source> - <translation type="unfinished">当终端窗口获得焦点时禁用全局快捷方式</translation> + <translation>当终端窗口获得焦点时禁用全局快捷方式</translation> </message> <message> <location line="+53"/> <source>Export</source> - <translation type="unfinished">导出</translation> + <translation>导出</translation> </message> <message> <location line="-10"/> <source>Import</source> - <translation type="unfinished">导入</translation> + <translation>导入</translation> </message> <message> <location line="+90"/> <source>Action</source> - <translation type="unfinished">动作</translation> + <translation>动作</translation> </message> <message> <location line="+83"/> @@ -4793,42 +4850,42 @@ <message> <location line="-16"/> <source>Hostname:</source> - <translation>主机名: </translation> + <translation>主机名:</translation> </message> <message> <location line="-342"/> <source>Extensions of files to be opened in the default text editor (separated by ";"):</source> - <translation type="unfinished">要在默认文本编辑器中打开的文件的扩展名 (以 ";" 分隔):</translation> + <translation>要在默认文本编辑器中打开的文件的扩展名 (以 ";" 分隔):</translation> </message> <message> <location line="+386"/> <source>Proxy type:</source> - <translation>代理类型: </translation> + <translation>代理类型:</translation> </message> <message> <location line="+10"/> <source>Port:</source> - <translation>端口: </translation> + <translation>端口:</translation> </message> <message> <location line="-27"/> <source>Username:</source> - <translation>用户名: </translation> + <translation>用户名:</translation> </message> <message> <location line="+37"/> <source>Password:</source> - <translation>密码: </translation> + <translation>密码:</translation> </message> <message> <location filename="../src/settings-dialog.cc" line="+127"/> <source>Octave Settings</source> - <translation type="unfinished">Octave 设置</translation> + <translation>Octave 设置</translation> </message> <message> <location line="+1"/> <source>Unable to save settings. Missing settings file or unknown directory.</source> - <translation type="unfinished">无法保存设置，缺少设置文件或未知目录。</translation> + <translation>无法保存设置，缺少设置文件或未知目录。</translation> </message> <message> <location line="+15"/> @@ -4855,12 +4912,12 @@ <message> <location line="+172"/> <source>Set Octave Startup Directory</source> - <translation type="unfinished">设置 Octave 启动目录</translation> + <translation>设置 Octave 启动目录</translation> </message> <message> <location line="+6"/> <source>Set File Browser Startup Directory</source> - <translation type="unfinished">设置文件浏览器启动目录</translation> + <translation>设置文件浏览器启动目录</translation> </message> </context> </TS>
--- a/libgui/src/m-editor/file-editor.cc Tue Apr 17 12:48:33 2018 -0700 +++ b/libgui/src/m-editor/file-editor.cc Tue Apr 17 21:47:28 2018 -0400 @@ -1432,6 +1432,15 @@ menu->addSeparator (); menu->addAction (m_selectall_action); menu->addSeparator (); + menu->addAction (m_find_files_action); + menu->addAction (m_find_action); + menu->addAction (m_find_next_action); + menu->addAction (m_find_previous_action); + menu->addSeparator (); + menu->addMenu (m_edit_cmd_menu); + menu->addMenu (m_edit_fmt_menu); + menu->addMenu (m_edit_nav_menu); + menu->addSeparator (); menu->addAction (m_run_selection_action); }
--- a/libgui/src/main-window.cc Tue Apr 17 12:48:33 2018 -0700 +++ b/libgui/src/main-window.cc Tue Apr 17 21:47:28 2018 -0400 @@ -88,13 +88,11 @@ namespace octave { octave_interpreter::octave_interpreter (application *app_context) - : QObject (), m_thread_manager (), m_app_context (app_context) + : QObject (), m_app_context (app_context) { } void octave_interpreter::execute (void) { - m_thread_manager.register_current_thread (); - // The application context owns the interpreter. interpreter& interp = m_app_context->create_interpreter (); @@ -143,11 +141,6 @@ emit octave_finished_signal (exit_status); } - void octave_interpreter::interrupt (void) - { - m_thread_manager.interrupt (); - } - main_window::main_window (QWidget *p, gui_application *app_context) : QMainWindow (p), m_app_context (app_context), m_interpreter (new octave_interpreter (app_context)), @@ -1653,11 +1646,6 @@ m_clipboard->clear (QClipboard::Clipboard); } - void main_window::interrupt_interpreter (void) - { - m_interpreter->interrupt (); - } - void main_window::disable_menu_shortcuts (bool disable) { QHash<QMenu*, QStringList>::const_iterator i = m_hash_menu_text.constBegin (); @@ -1774,9 +1762,6 @@ connect (m_variable_editor_window, SIGNAL (updated (void)), this, SLOT (handle_variable_editor_update (void))); - connect (m_command_window, SIGNAL (interrupt_signal (void)), - this, SLOT (interrupt_interpreter (void))); - construct_menu_bar (); construct_tool_bar ();
--- a/libgui/src/main-window.h Tue Apr 17 12:48:33 2018 -0700 +++ b/libgui/src/main-window.h Tue Apr 17 21:47:28 2018 -0400 @@ -56,7 +56,6 @@ #include "resource-manager.h" #include "terminal-dock-widget.h" #include "variable-editor.h" -#include "thread-manager.h" #include "workspace-model.h" #include "workspace-view.h" @@ -76,8 +75,6 @@ ~octave_interpreter (void) = default; - void interrupt (void); - signals: void octave_ready_signal (void); @@ -91,8 +88,6 @@ private: - thread_manager m_thread_manager; - application *m_app_context; }; @@ -269,8 +264,6 @@ void clear_clipboard (); //!@} - void interrupt_interpreter (void); - //! Returns a list of dock widgets. QList<octave_dock_widget *> get_dock_widget_list (void)
--- a/libgui/src/module.mk Tue Apr 17 12:48:33 2018 -0700 +++ b/libgui/src/module.mk Tue Apr 17 21:47:28 2018 -0400 @@ -176,7 +176,6 @@ %reldir%/settings-dialog.h \ %reldir%/shortcut-manager.h \ %reldir%/tab-bar.h \ - %reldir%/thread-manager.h \ %reldir%/terminal-dock-widget.h \ %reldir%/color-picker.h \ %reldir%/welcome-wizard.h \ @@ -211,7 +210,6 @@ %reldir%/settings-dialog.cc \ %reldir%/shortcut-manager.cc \ %reldir%/tab-bar.cc \ - %reldir%/thread-manager.cc \ %reldir%/terminal-dock-widget.cc \ %reldir%/color-picker.cc \ %reldir%/welcome-wizard.cc \
--- a/libgui/src/octave-gui.cc Tue Apr 17 12:48:33 2018 -0700 +++ b/libgui/src/octave-gui.cc Tue Apr 17 21:47:28 2018 -0400 @@ -42,6 +42,7 @@ #include "lo-utils.h" #include "oct-env.h" #include "oct-syscalls.h" +#include "signal-wrappers.h" #include "builtin-defun-decls.h" #include "defaults.h" @@ -54,7 +55,6 @@ #include "octave-gui.h" #include "resource-manager.h" #include "shortcut-manager.h" -#include "thread-manager.h" #include "welcome-wizard.h" // Disable all Qt messages by default. @@ -84,7 +84,7 @@ int gui_application::execute (void) { - thread_manager::block_interrupt_signal (); + octave_block_interrupt_signal (); set_application_id ();
--- a/libgui/src/terminal-dock-widget.cc Tue Apr 17 12:48:33 2018 -0700 +++ b/libgui/src/terminal-dock-widget.cc Tue Apr 17 21:47:28 2018 -0400 @@ -30,6 +30,9 @@ #include "terminal-dock-widget.h" #include "resource-manager.h" +#include "sighandlers.h" +#include "quit.h" + namespace octave { terminal_dock_widget::terminal_dock_widget (QWidget *p) @@ -103,6 +106,9 @@ void terminal_dock_widget::terminal_interrupt (void) { - emit interrupt_signal (); + // FIXME: Protect with mutex? + + octave_signal_caught = 1; + octave_interrupt_state++; } }
--- a/libgui/src/thread-manager.cc Tue Apr 17 12:48:33 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -/* - -Copyright (C) 2013-2018 John W. Eaton - -This file is part of Octave. - -Octave is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Octave is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<https://www.gnu.org/licenses/>. - -*/ - -#if defined (HAVE_CONFIG_H) -# include "config.h" -#endif - -#if defined (OCTAVE_USE_WINDOWS_API) -# include <windows.h> -#else -# include <pthread.h> -#endif - -#include "signal-wrappers.h" - -#include "thread-manager.h" - -namespace octave -{ -#if defined (OCTAVE_USE_WINDOWS_API) - - class windows_thread_manager : public base_thread_manager - { - public: - - windows_thread_manager (void) : base_thread_manager () { } - - void register_current_thread (void) { } - - void interrupt (void) - { - GenerateConsoleCtrlEvent (CTRL_C_EVENT, 0); - } - }; - -#else - - class pthread_thread_manager : public base_thread_manager - { - public: - - pthread_thread_manager (void) - : base_thread_manager (), m_my_thread (), m_initialized (false) - { } - - void register_current_thread (void) - { - m_my_thread = pthread_self (); - m_initialized = true; - } - - void interrupt (void) - { - if (m_initialized) - { - // Send SIGINT to all other processes in our process group. - // This is needed to interrupt calls to system (), for example. - - // FIXME: What happens if some code inside a - // {BEGIN,END}_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE block starts - // additional threads and one of those happens to catch this signal? - // Would the interrupt handler and the subsequent longjmp and exception - // all be executed in the wrong thread? If so, is there any way to - // prevent that from happening? - - int sigint; - octave_get_sig_number ("SIGINT", &sigint); - - octave_kill_wrapper (0, sigint); - } - } - - private: - - pthread_t m_my_thread; - - bool m_initialized; - }; - -#endif - - thread_manager::thread_manager (void) - : m_rep (thread_manager::create_rep ()) - { } - - void thread_manager::block_interrupt_signal (void) - { - octave_block_interrupt_signal (); - } - - void thread_manager::unblock_interrupt_signal (void) - { - octave_unblock_interrupt_signal (); - } - - base_thread_manager * thread_manager::create_rep (void) - { -#if defined (OCTAVE_USE_WINDOWS_API) - return new windows_thread_manager (); -#else - return new pthread_thread_manager (); -#endif - } -}
--- a/libgui/src/thread-manager.h Tue Apr 17 12:48:33 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -/* - -Copyright (C) 2013-2018 John W. Eaton - -This file is part of Octave. - -Octave is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Octave is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<https://www.gnu.org/licenses/>. - -*/ - -#if ! defined (octave_thread_manager_h) -#define octave_thread_manager_h 1 - -#include "octave-config.h" - -#include <memory> - -namespace octave -{ - class base_thread_manager - { - public: - - friend class thread_manager; - - base_thread_manager (void) = default; - - base_thread_manager (const base_thread_manager&) = default; - - virtual ~base_thread_manager (void) = default; - - virtual void register_current_thread (void) = 0; - - virtual void interrupt (void) = 0; - }; - - class thread_manager - { - public: - - thread_manager (void); - - ~thread_manager (void) = default; - - thread_manager (const thread_manager&) = default; - - thread_manager& operator = (const thread_manager&) = default; - - void register_current_thread (void) { m_rep->register_current_thread (); } - - void interrupt (void) { m_rep->interrupt (); } - - static void block_interrupt_signal (void); - - static void unblock_interrupt_signal (void); - - private: - - std::shared_ptr<base_thread_manager> m_rep; - - static base_thread_manager * create_rep (void); - }; -} - -#endif
--- a/libinterp/corefcn/pr-output.h Tue Apr 17 12:48:33 2018 -0700 +++ b/libinterp/corefcn/pr-output.h Tue Apr 17 21:47:28 2018 -0400 @@ -58,7 +58,7 @@ template <typename T> float_display_format -make_format (const std::complex<T>& c) +make_format (const std::complex<T>&) { return float_display_format (); }