diff -r 9f7028ab8294 -r 467f6daff4e9 i18n/Beremiz_zh_CN.po --- a/i18n/Beremiz_zh_CN.po Fri Sep 28 13:07:46 2018 +0300 +++ b/i18n/Beremiz_zh_CN.po Fri Sep 28 13:17:30 2018 +0300 @@ -1,19 +1,16 @@ -# English translations for Beremiz package. -# Copyright (C) 2017 THE Beremiz'S COPYRIGHT HOLDER +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Beremiz package. -# Automatically generated, 2017. +# FIRST AUTHOR , YEAR. # -# Translators: -# Andrey Skvortsov , 2017 -# frank guan , 2017 -# Tango_Wu , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: Beremiz\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-05 13:02+0300\n" -"PO-Revision-Date: 2017-07-05 13:02+0300\n" -"Last-Translator: Tango_Wu , 2017\n" +"POT-Creation-Date: 2018-06-15 16:39+0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: yiwei Yan <523136664@qq.com>, 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/beremiz/teams/75746/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +18,7 @@ "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../BeremizIDE.py:1095 ../PLCOpenEditor.py:418 +#: ../util/ExceptionHandler.py:58 #, python-format msgid "" "\n" @@ -46,151 +43,156 @@ "\n" "追溯：\n" -#: ../controls/VariablePanel.py:72 +#: ../controls/VariablePanel.py:90 msgid " External" msgstr " 外部" -#: ../controls/VariablePanel.py:71 +#: ../controls/VariablePanel.py:89 msgid " InOut" msgstr " 输入输出" -#: ../controls/VariablePanel.py:71 +#: ../controls/VariablePanel.py:89 msgid " Input" msgstr " 输入" -#: ../controls/VariablePanel.py:72 +#: ../controls/VariablePanel.py:90 msgid " Local" msgstr " 本地" -#: ../controls/VariablePanel.py:71 +#: ../controls/VariablePanel.py:89 msgid " Output" msgstr " 输出" -#: ../controls/VariablePanel.py:73 +#: ../controls/VariablePanel.py:91 msgid " Temp" msgstr "临时" -#: ../dialogs/PouTransitionDialog.py:94 ../dialogs/ProjectDialog.py:69 -#: ../dialogs/PouActionDialog.py:92 ../dialogs/PouDialog.py:114 +#: ../dialogs/PouTransitionDialog.py:101 ../dialogs/ProjectDialog.py:74 +#: ../dialogs/PouActionDialog.py:99 ../dialogs/PouDialog.py:122 #, python-format msgid " and %s" msgstr "和 %s" -#: ../ProjectController.py:1151 +#: ../ProjectController.py:1182 msgid " generation failed !\n" msgstr "生成失败！\n" -#: ../plcopen/plcopen.py:886 +#: ../plcopen/plcopen.py:1029 #, python-format msgid "\"%s\" Data Type doesn't exist !!!" msgstr "\"%s\" 数据类型尚不存在！！！" -#: ../plcopen/plcopen.py:904 +#: ../plcopen/plcopen.py:1047 #, python-format msgid "\"%s\" POU already exists !!!" msgstr "\"%s\"POU已经存在！！！" -#: ../plcopen/plcopen.py:925 +#: ../plcopen/plcopen.py:1068 #, python-format msgid "\"%s\" POU doesn't exist !!!" msgstr "\"%s\" POU不存在！！！" -#: ../editors/Viewer.py:247 +#: ../editors/Viewer.py:288 #, python-format msgid "\"%s\" can't use itself!" msgstr "\"%s\" 不能自己使用！" -#: ../IDEFrame.py:1655 ../IDEFrame.py:1674 +#: ../IDEFrame.py:1688 ../IDEFrame.py:1707 #, python-format msgid "\"%s\" config already exists!" msgstr "\"%s\" 配置已存在！" -#: ../plcopen/plcopen.py:472 +#: ../plcopen/plcopen.py:531 #, python-format msgid "\"%s\" configuration already exists !!!" msgstr "\"%s\" 配置已存在！！！" -#: ../IDEFrame.py:1605 +#: ../plcopen/plcopen.py:540 +#, python-format +msgid "\"%s\" configuration doesn't exist !!!" +msgstr "“ %s ” 配置不存在！！！" + +#: ../IDEFrame.py:1638 #, python-format msgid "\"%s\" data type already exists!" msgstr "\"%s\" 数据类型已存在！" -#: ../dialogs/PouTransitionDialog.py:105 ../dialogs/BlockPreviewDialog.py:220 -#: ../dialogs/PouActionDialog.py:103 ../editors/Viewer.py:263 -#: ../editors/Viewer.py:331 ../editors/Viewer.py:355 ../editors/Viewer.py:375 -#: ../editors/TextViewer.py:272 ../editors/TextViewer.py:301 -#: ../controls/VariablePanel.py:396 +#: ../dialogs/PouTransitionDialog.py:112 ../dialogs/BlockPreviewDialog.py:220 +#: ../dialogs/PouActionDialog.py:110 ../editors/Viewer.py:304 +#: ../editors/Viewer.py:374 ../editors/Viewer.py:398 ../editors/Viewer.py:418 +#: ../editors/TextViewer.py:270 ../editors/TextViewer.py:299 +#: ../controls/VariablePanel.py:425 #, python-format msgid "\"%s\" element for this pou already exists!" msgstr "\"%s\" 元素对于此POU已经存在！" -#: ../BeremizIDE.py:897 +#: ../BeremizIDE.py:928 #, python-format msgid "\"%s\" folder is not a valid Beremiz project\n" msgstr "\"%s\" 文件夹不是有效的Beremiz项目\n" -#: ../dialogs/SFCStepNameDialog.py:52 ../dialogs/PouTransitionDialog.py:101 -#: ../dialogs/BlockPreviewDialog.py:208 ../dialogs/PouNameDialog.py:50 -#: ../dialogs/PouActionDialog.py:99 ../dialogs/PouDialog.py:121 -#: ../editors/ResourceEditor.py:449 ../editors/ResourceEditor.py:484 -#: ../editors/DataTypeEditor.py:555 ../editors/DataTypeEditor.py:587 -#: ../editors/CodeFileEditor.py:776 ../controls/VariablePanel.py:773 -#: ../IDEFrame.py:1596 +#: ../dialogs/SFCStepNameDialog.py:56 ../dialogs/PouTransitionDialog.py:108 +#: ../dialogs/BlockPreviewDialog.py:209 ../dialogs/PouNameDialog.py:54 +#: ../dialogs/PouActionDialog.py:106 ../dialogs/PouDialog.py:129 +#: ../editors/ResourceEditor.py:483 ../editors/ResourceEditor.py:518 +#: ../editors/DataTypeEditor.py:571 ../editors/DataTypeEditor.py:603 +#: ../editors/CodeFileEditor.py:774 ../controls/VariablePanel.py:787 +#: ../IDEFrame.py:1629 #, python-format msgid "\"%s\" is a keyword. It can't be used!" msgstr "\"%s\" 是一个关键词。它不能被使用！" -#: ../plcopen/plcopen.py:2417 +#: ../plcopen/plcopen.py:2836 #, python-format msgid "\"%s\" is an invalid value!" msgstr "\"%s\"不是有效值！" -#: ../PLCOpenEditor.py:349 ../PLCOpenEditor.py:391 +#: ../PLCOpenEditor.py:323 ../PLCOpenEditor.py:365 #, python-format msgid "\"%s\" is not a valid folder!" msgstr "\"%s\"不是有效文件夹！" -#: ../dialogs/SFCStepNameDialog.py:50 ../dialogs/PouTransitionDialog.py:99 -#: ../dialogs/BlockPreviewDialog.py:204 ../dialogs/PouNameDialog.py:48 -#: ../dialogs/PouActionDialog.py:97 ../dialogs/PouDialog.py:119 -#: ../editors/ResourceEditor.py:447 ../editors/ResourceEditor.py:482 -#: ../editors/DataTypeEditor.py:585 ../editors/CodeFileEditor.py:774 -#: ../controls/VariablePanel.py:771 ../IDEFrame.py:1594 +#: ../dialogs/SFCStepNameDialog.py:54 ../dialogs/PouTransitionDialog.py:106 +#: ../dialogs/BlockPreviewDialog.py:205 ../dialogs/PouNameDialog.py:52 +#: ../dialogs/PouActionDialog.py:104 ../dialogs/PouDialog.py:127 +#: ../editors/ResourceEditor.py:481 ../editors/ResourceEditor.py:516 +#: ../editors/DataTypeEditor.py:601 ../editors/CodeFileEditor.py:772 +#: ../controls/VariablePanel.py:785 ../IDEFrame.py:1627 #, python-format msgid "\"%s\" is not a valid identifier!" msgstr "\"%s\"不是有效标识符！" -#: ../IDEFrame.py:2410 +#: ../IDEFrame.py:2436 #, python-format msgid "\"%s\" is used by one or more POUs. Do you wish to continue?" msgstr "\"%s\"被一个或多个程序组织单元使用，你确定要继续吗？ " -#: ../dialogs/BlockPreviewDialog.py:212 ../dialogs/PouDialog.py:123 -#: ../editors/Viewer.py:261 ../editors/Viewer.py:316 ../editors/Viewer.py:346 -#: ../editors/Viewer.py:368 ../editors/TextViewer.py:270 -#: ../editors/TextViewer.py:299 ../editors/TextViewer.py:350 -#: ../editors/TextViewer.py:373 ../controls/VariablePanel.py:338 -#: ../IDEFrame.py:1614 +#: ../dialogs/BlockPreviewDialog.py:213 ../dialogs/PouDialog.py:131 +#: ../editors/Viewer.py:302 ../editors/Viewer.py:359 ../editors/Viewer.py:389 +#: ../editors/Viewer.py:411 ../editors/TextViewer.py:268 +#: ../editors/TextViewer.py:297 ../editors/TextViewer.py:351 +#: ../editors/TextViewer.py:374 ../controls/VariablePanel.py:364 +#: ../IDEFrame.py:1647 #, python-format msgid "\"%s\" pou already exists!" msgstr "\"%s\"编程组织单元已经存在！" -#: ../dialogs/SFCStepNameDialog.py:58 +#: ../dialogs/SFCStepNameDialog.py:62 #, python-format msgid "\"%s\" step already exists!" msgstr "\"%s\"步骤已经存在！" -#: ../editors/DataTypeEditor.py:550 +#: ../editors/DataTypeEditor.py:566 #, python-format msgid "\"%s\" value already defined!" msgstr "\"%s\" 值已经被定义！" -#: ../dialogs/ArrayTypeDialog.py:97 ../editors/DataTypeEditor.py:743 +#: ../dialogs/ArrayTypeDialog.py:105 ../editors/DataTypeEditor.py:759 #, python-format msgid "\"%s\" value isn't a valid array dimension!" msgstr "\"%s\" 值不是有效数组维数！" -#: ../dialogs/ArrayTypeDialog.py:103 ../editors/DataTypeEditor.py:750 +#: ../dialogs/ArrayTypeDialog.py:109 ../editors/DataTypeEditor.py:766 #, python-format msgid "" "\"%s\" value isn't a valid array dimension!\n" @@ -199,209 +201,205 @@ "\"%s\" 不是一个有效的数组维数值！\n" "右边的数值必须大于左边的数值。" -#: ../PLCGenerator.py:1101 +#: ../PLCGenerator.py:1133 #, python-brace-format msgid "\"{a1}\" function cancelled in \"{a2}\" POU: No input connected" msgstr "\"{a1}\" 功能 被取消在 \"{a2}\" POU：没有输入被连接" -#: ../editors/Viewer.py:251 +#: ../editors/Viewer.py:292 #, python-brace-format msgid "\"{a1}\" is already used by \"{a2}\"!" msgstr "\"{a1}\" 被用在了 \"{a2}\"!" -#: ../plcopen/plcopen.py:496 +#: ../plcopen/plcopen.py:557 #, python-brace-format msgid "\"{a1}\" resource already exists in \"{a2}\" configuration !!!" msgstr "\"{a1}\" 资源已经存在于 \"{a2}\" 配置 ！！！" -#: ../plcopen/plcopen.py:514 +#: ../plcopen/plcopen.py:577 #, python-brace-format msgid "\"{a1}\" resource doesn't exist in \"{a2}\" configuration !!!" msgstr "\"{a1}\" 资源部存在于 \"{a2}\" 配置！！！" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:578 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:580 #, python-format msgid "%03gms" msgstr "%03gms" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:569 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:571 #, python-format msgid "%dd" msgstr "%dd" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:56 -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:570 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:61 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:572 #, python-format msgid "%dh" msgstr "%dh" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:55 -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:571 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:60 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:573 #, python-format msgid "%dm" msgstr "%dm" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:53 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:58 #, python-format msgid "%dms" msgstr "%dms" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:54 -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:572 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:59 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:574 #, python-format msgid "%ds" msgstr "%ds" -#: ../PLCControler.py:1533 +#: ../PLCControler.py:1114 #, python-format msgid "%s Data Types" msgstr "%s 数据类型" -#: ../PLCControler.py:1516 +#: ../PLCControler.py:1097 #, python-format msgid "%s POUs" msgstr "%s POUs" -#: ../canfestival/SlaveEditor.py:69 ../canfestival/NetworkEditor.py:90 +#: ../canfestival/SlaveEditor.py:73 ../canfestival/NetworkEditor.py:97 #, python-format msgid "%s Profile" msgstr "%s Profile" -#: ../plcopen/plcopen.py:1650 ../plcopen/plcopen.py:1657 -#: ../plcopen/plcopen.py:1669 ../plcopen/plcopen.py:1677 -#: ../plcopen/plcopen.py:1687 +#: ../plcopen/plcopen.py:1901 ../plcopen/plcopen.py:1908 +#: ../plcopen/plcopen.py:1921 ../plcopen/plcopen.py:1929 +#: ../plcopen/plcopen.py:1939 ../plcopen/plcopen.py:1950 #, python-format msgid "%s body don't have instances!" msgstr "%s 未包含实例！" -#: ../plcopen/plcopen.py:1705 ../plcopen/plcopen.py:1712 -#: ../plcopen/plcopen.py:1719 +#: ../plcopen/plcopen.py:1957 ../plcopen/plcopen.py:1964 +#: ../plcopen/plcopen.py:1971 #, python-format msgid "%s body don't have text!" msgstr "%s 未包含文本！" -#: ../IDEFrame.py:386 +#: ../IDEFrame.py:388 msgid "&Add Element" msgstr "&增加元素" -#: ../dialogs/AboutDialog.py:73 ../dialogs/AboutDialog.py:121 -#: ../dialogs/AboutDialog.py:158 +#: ../dialogs/AboutDialog.py:71 ../dialogs/AboutDialog.py:117 +#: ../dialogs/AboutDialog.py:152 msgid "&Close" msgstr "&关闭" -#: ../IDEFrame.py:356 +#: ../IDEFrame.py:361 msgid "&Configuration" msgstr "&配置" -#: ../IDEFrame.py:345 +#: ../IDEFrame.py:350 msgid "&Data Type" msgstr "&数据类型" -#: ../IDEFrame.py:390 +#: ../IDEFrame.py:392 msgid "&Delete" msgstr "&删除" -#: ../IDEFrame.py:337 +#: ../IDEFrame.py:342 msgid "&Display" msgstr "&显示" -#: ../IDEFrame.py:336 +#: ../IDEFrame.py:341 msgid "&Edit" msgstr "&编辑" -#: ../IDEFrame.py:335 +#: ../IDEFrame.py:340 msgid "&File" msgstr "&文件" -#: ../IDEFrame.py:347 +#: ../IDEFrame.py:352 msgid "&Function" msgstr "&功能" -#: ../IDEFrame.py:338 +#: ../IDEFrame.py:343 msgid "&Help" msgstr "&帮助" -#: ../dialogs/AboutDialog.py:72 +#: ../dialogs/AboutDialog.py:70 msgid "&License" msgstr "&许可" -#: ../IDEFrame.py:351 +#: ../IDEFrame.py:356 msgid "&Program" msgstr "&程序" -#: ../PLCOpenEditor.py:127 +#: ../PLCOpenEditor.py:98 msgid "&Properties" msgstr "&属性" -#: ../BeremizIDE.py:219 +#: ../BeremizIDE.py:244 msgid "&Recent Projects" msgstr "&最近项目" -#: ../IDEFrame.py:353 +#: ../IDEFrame.py:358 msgid "&Resource" msgstr "&资源" -#: ../controls/SearchResultPanel.py:239 +#: ../controls/SearchResultPanel.py:247 #, python-brace-format msgid "'{a1}' - {a2} match in project" msgstr "'{a1}' - {a2} 在项目中匹配" -#: ../controls/SearchResultPanel.py:241 +#: ../controls/SearchResultPanel.py:249 #, python-brace-format msgid "'{a1}' - {a2} matches in project" msgstr "'{a1}' - {a2} 在项目中匹配" -#: ../connectors/PYRO/__init__.py:90 +#: ../connectors/PYRO/__init__.py:98 #, python-brace-format msgid "'{a1}' is located at {a2}\n" msgstr "'{a1}' 位于 {a2}\n" -#: ../controls/SearchResultPanel.py:291 +#: ../controls/SearchResultPanel.py:298 #, python-format msgid "(%d matches)" msgstr "(%d 匹配)" -#: ../PLCOpenEditor.py:406 ../PLCOpenEditor.py:408 ../PLCOpenEditor.py:409 -msgid ", " -msgstr "，" - -#: ../dialogs/PouTransitionDialog.py:96 ../dialogs/PouActionDialog.py:94 -#: ../dialogs/PouDialog.py:116 +#: ../dialogs/PouTransitionDialog.py:103 ../dialogs/PouActionDialog.py:101 +#: ../dialogs/PouDialog.py:124 #, python-format msgid ", %s" msgstr "， %s" -#: ../PLCOpenEditor.py:404 -msgid ". " -msgstr "。" - -#: ../controls/LogViewer.py:279 +#: ../controls/UriLocationEditor.py:49 +msgid "- Select URI type -" +msgstr "- 选择 URI 类型 -" + +#: ../controls/LogViewer.py:287 msgid "1d" msgstr "1d" -#: ../controls/LogViewer.py:280 +#: ../controls/LogViewer.py:288 msgid "1h" msgstr "1h" -#: ../controls/LogViewer.py:281 +#: ../controls/LogViewer.py:289 msgid "1m" msgstr "1m" -#: ../controls/LogViewer.py:282 +#: ../controls/LogViewer.py:290 msgid "1s" msgstr "1s" -#: ../dialogs/PouDialog.py:125 ../IDEFrame.py:1617 ../IDEFrame.py:1663 -#: ../IDEFrame.py:1682 +#: ../dialogs/PouDialog.py:133 ../IDEFrame.py:1650 ../IDEFrame.py:1696 +#: ../IDEFrame.py:1715 #, python-format msgid "" "A POU has an element named \"%s\". This could cause a conflict. Do you wish " "to continue?" msgstr "一个编程组织单元的成员被命名为\"%s\"。这可能会产生冲突。你希望继续吗？" -#: ../dialogs/SFCStepNameDialog.py:54 ../dialogs/PouTransitionDialog.py:103 -#: ../dialogs/PouNameDialog.py:52 ../dialogs/PouActionDialog.py:101 -#: ../controls/VariablePanel.py:775 ../IDEFrame.py:1631 ../IDEFrame.py:1644 +#: ../dialogs/SFCStepNameDialog.py:58 ../dialogs/PouTransitionDialog.py:110 +#: ../dialogs/PouNameDialog.py:56 ../dialogs/PouActionDialog.py:108 +#: ../controls/VariablePanel.py:789 ../IDEFrame.py:1664 ../IDEFrame.py:1677 #, python-format msgid "A POU named \"%s\" already exists!" msgstr "一个以\"%s\"命名的的编程组织单元已经存在！" @@ -411,26 +409,26 @@ msgid "A child named \"{a1}\" already exists -> \"{a2}\"\n" msgstr "一个子命名的 \"{a1}\" 已经存在 -> \"{a2}\"\n" -#: ../dialogs/BrowseLocationsDialog.py:218 +#: ../dialogs/BrowseLocationsDialog.py:229 msgid "A location must be selected!" msgstr "一个定位必须被选择！" -#: ../editors/ResourceEditor.py:451 +#: ../editors/ResourceEditor.py:485 msgid "A task with the same name already exists!" msgstr "相同名称的任务已经存在！" -#: ../dialogs/SFCStepNameDialog.py:56 ../controls/VariablePanel.py:777 -#: ../IDEFrame.py:1633 ../IDEFrame.py:1646 +#: ../dialogs/SFCStepNameDialog.py:60 ../controls/VariablePanel.py:791 +#: ../IDEFrame.py:1666 ../IDEFrame.py:1679 #, python-format msgid "A variable with \"%s\" as name already exists in this pou!" msgstr "一个以\"%s\"命名的变量在这个编程组织单元中已经存在！" -#: ../editors/CodeFileEditor.py:780 +#: ../editors/CodeFileEditor.py:778 #, python-format msgid "A variable with \"%s\" as name already exists!" msgstr "一个变量以 \"%s\" 作为名字已经存在！" -#: ../BeremizIDE.py:283 ../dialogs/AboutDialog.py:48 ../PLCOpenEditor.py:168 +#: ../BeremizIDE.py:311 ../dialogs/AboutDialog.py:46 ../PLCOpenEditor.py:142 msgid "About" msgstr "关于" @@ -438,125 +436,125 @@ msgid "Absolute number" msgstr "绝对值" -#: ../dialogs/SFCStepDialog.py:73 ../dialogs/ActionBlockDialog.py:43 +#: ../dialogs/SFCStepDialog.py:75 ../dialogs/ActionBlockDialog.py:47 msgid "Action" msgstr "动作" -#: ../editors/Viewer.py:614 ../editors/Viewer.py:2394 +#: ../editors/Viewer.py:653 ../editors/Viewer.py:2427 msgid "Action Block" msgstr "动作控制功能块" -#: ../dialogs/PouActionDialog.py:82 +#: ../dialogs/PouActionDialog.py:89 msgid "Action Name" msgstr "动作名字" -#: ../dialogs/PouActionDialog.py:49 +#: ../dialogs/PouActionDialog.py:56 msgid "Action Name:" msgstr "动作名字：" -#: ../plcopen/plcopen.py:1364 +#: ../plcopen/plcopen.py:1567 #, python-format msgid "Action with name %s doesn't exist!" msgstr "一个以\"%s\"命名的的行动不存在！" -#: ../PLCControler.py:98 +#: ../plcopen/types_enums.py:76 msgid "Actions" msgstr "动作" -#: ../dialogs/ActionBlockDialog.py:133 +#: ../dialogs/ActionBlockDialog.py:139 msgid "Actions:" msgstr "动作：" -#: ../editors/Viewer.py:431 +#: ../editors/Viewer.py:473 msgid "Active" msgstr "活动" -#: ../canfestival/SlaveEditor.py:80 ../canfestival/NetworkEditor.py:101 -#: ../BeremizIDE.py:965 ../editors/Viewer.py:647 +#: ../canfestival/SlaveEditor.py:84 ../canfestival/NetworkEditor.py:108 +#: ../BeremizIDE.py:1001 ../editors/Viewer.py:686 msgid "Add" msgstr "添加" -#: ../IDEFrame.py:1893 ../IDEFrame.py:1928 +#: ../IDEFrame.py:1924 ../IDEFrame.py:1959 msgid "Add Action" msgstr "添加动作" -#: ../features.py:32 +#: ../features.py:33 msgid "Add C code accessing located variables synchronously" msgstr "同步的增加C代码访问定位的变量" -#: ../IDEFrame.py:1876 +#: ../IDEFrame.py:1907 msgid "Add Configuration" msgstr "添加配置" -#: ../IDEFrame.py:1856 +#: ../IDEFrame.py:1887 msgid "Add DataType" msgstr "添加数据类型" -#: ../editors/Viewer.py:572 +#: ../editors/Viewer.py:609 msgid "Add Divergence Branch" msgstr "添加发散分支" -#: ../dialogs/DiscoveryDialog.py:117 +#: ../dialogs/DiscoveryDialog.py:121 msgid "Add IP" msgstr "添加 IP" -#: ../IDEFrame.py:1864 +#: ../IDEFrame.py:1895 msgid "Add POU" msgstr "添加 POU" -#: ../features.py:33 +#: ../features.py:34 msgid "Add Python code executed asynchronously" msgstr "添加异步执行的Python代码" -#: ../IDEFrame.py:1904 ../IDEFrame.py:1954 +#: ../IDEFrame.py:1935 ../IDEFrame.py:1985 msgid "Add Resource" msgstr "添加源" -#: ../IDEFrame.py:1882 ../IDEFrame.py:1925 +#: ../IDEFrame.py:1913 ../IDEFrame.py:1956 msgid "Add Transition" msgstr "添加跃迁" -#: ../editors/Viewer.py:559 +#: ../editors/Viewer.py:596 msgid "Add Wire Segment" msgstr "添加布线段" -#: ../editors/SFCViewer.py:433 +#: ../editors/SFCViewer.py:447 msgid "Add a new initial step" msgstr "新建一个初始步骤" -#: ../editors/Viewer.py:2757 ../editors/SFCViewer.py:770 +#: ../editors/Viewer.py:2791 ../editors/SFCViewer.py:784 msgid "Add a new jump" msgstr "新建一个跳跃" -#: ../editors/SFCViewer.py:455 +#: ../editors/SFCViewer.py:469 msgid "Add a new step" msgstr "添加一个新步骤" -#: ../features.py:34 +#: ../features.py:35 msgid "Add a simple WxGlade based GUI." msgstr "添加一个简单的基于 WxGlade的 GUI." -#: ../dialogs/ActionBlockDialog.py:137 +#: ../dialogs/ActionBlockDialog.py:143 msgid "Add action" msgstr "添加动作" -#: ../editors/DataTypeEditor.py:352 +#: ../editors/DataTypeEditor.py:364 msgid "Add element" msgstr "添加元素" -#: ../editors/ResourceEditor.py:268 +#: ../editors/ResourceEditor.py:283 msgid "Add instance" msgstr "添加实例" -#: ../canfestival/NetworkEditor.py:103 +#: ../canfestival/NetworkEditor.py:110 msgid "Add slave" msgstr "添加从站" -#: ../editors/ResourceEditor.py:239 +#: ../editors/ResourceEditor.py:252 msgid "Add task" msgstr "添加任务" -#: ../editors/CodeFileEditor.py:658 ../controls/VariablePanel.py:450 +#: ../editors/CodeFileEditor.py:654 ../controls/VariablePanel.py:481 msgid "Add variable" msgstr "添加变量" @@ -564,44 +562,44 @@ msgid "Addition" msgstr "加法" -#: ../plcopen/definitions.py:49 +#: ../plcopen/definitions.py:51 msgid "Additional function blocks" msgstr "附加功能类型" -#: ../editors/Viewer.py:630 +#: ../editors/Viewer.py:669 msgid "Adjust Block Size" msgstr "调整块尺寸" -#: ../editors/Viewer.py:1686 +#: ../editors/Viewer.py:1720 msgid "Alignment" msgstr "对准" -#: ../dialogs/BrowseLocationsDialog.py:40 -#: ../dialogs/BrowseLocationsDialog.py:48 -#: ../dialogs/BrowseLocationsDialog.py:141 -#: ../dialogs/BrowseLocationsDialog.py:144 ../controls/LogViewer.py:298 -#: ../controls/VariablePanel.py:70 +#: ../dialogs/BrowseLocationsDialog.py:42 +#: ../dialogs/BrowseLocationsDialog.py:53 +#: ../dialogs/BrowseLocationsDialog.py:152 +#: ../dialogs/BrowseLocationsDialog.py:155 ../controls/LogViewer.py:307 +#: ../controls/VariablePanel.py:88 msgid "All" msgstr "所有" -#: ../editors/FileManagementPanel.py:35 +#: ../editors/FileManagementPanel.py:37 msgid "All files (*.*)|*.*|CSV files (*.csv)|*.csv" msgstr "所有文件 (*.*)|*.*|CSV 文件 (*.csv)|*.csv" -#: ../ProjectController.py:1685 +#: ../ProjectController.py:1670 msgid "Already connected. Please disconnect\n" msgstr "已经连接。请断开连接\n" -#: ../editors/DataTypeEditor.py:591 +#: ../editors/DataTypeEditor.py:607 #, python-format msgid "An element named \"%s\" already exists in this structure!" msgstr "一个以\"%s\"命名的元素已经在这个结构中存在！" -#: ../editors/ResourceEditor.py:486 +#: ../editors/ResourceEditor.py:520 msgid "An instance with the same name already exists!" msgstr "相同名称的实例已经存在！" -#: ../dialogs/ConnectionDialog.py:100 +#: ../dialogs/ConnectionDialog.py:103 msgid "Apply name modification to all continuations with the same name" msgstr "应用名称修改到所有伴随相同名称的延续" @@ -621,8 +619,8 @@ msgid "Arithmetic" msgstr "运算" -#: ../editors/DataTypeEditor.py:54 ../editors/DataTypeEditor.py:633 -#: ../controls/VariablePanel.py:858 +#: ../editors/DataTypeEditor.py:60 ../editors/DataTypeEditor.py:649 +#: ../controls/VariablePanel.py:872 msgid "Array" msgstr "阵列的" @@ -630,45 +628,37 @@ msgid "Assignment" msgstr "分配" -#: ../dialogs/FBDVariableDialog.py:222 +#: ../dialogs/FBDVariableDialog.py:226 msgid "At least a variable or an expression must be selected!" msgstr "至少选择一个变量或者表达式！" -#: ../controls/ProjectPropertiesPanel.py:100 +#: ../controls/ProjectPropertiesPanel.py:111 msgid "Author" msgstr "作者" -#: ../controls/ProjectPropertiesPanel.py:97 +#: ../controls/ProjectPropertiesPanel.py:108 msgid "Author Name (optional):" msgstr "作者姓名（选填）：" -#: ../dialogs/FindInPouDialog.py:77 +#: ../dialogs/FindInPouDialog.py:80 msgid "Backward" msgstr "反向" -#: ../util/Zeroconf.py:599 -msgid "Bad domain name (circular) at " -msgstr "不好域名称(循环的)在" - -#: ../util/Zeroconf.py:602 -msgid "Bad domain name at " -msgstr "不好的域名称在" - -#: ../canfestival/config_utils.py:342 ../canfestival/config_utils.py:630 +#: ../canfestival/config_utils.py:365 ../canfestival/config_utils.py:672 #, python-format msgid "Bad location size : %s" msgstr "不好的位置大小：%s" -#: ../dialogs/ArrayTypeDialog.py:54 ../editors/DataTypeEditor.py:175 -#: ../editors/DataTypeEditor.py:205 ../editors/DataTypeEditor.py:297 +#: ../dialogs/ArrayTypeDialog.py:57 ../editors/DataTypeEditor.py:183 +#: ../editors/DataTypeEditor.py:213 ../editors/DataTypeEditor.py:307 msgid "Base Type:" msgstr "基类型：" -#: ../editors/DataTypeEditor.py:623 ../controls/VariablePanel.py:816 +#: ../editors/DataTypeEditor.py:639 ../controls/VariablePanel.py:830 msgid "Base Types" msgstr "基类型" -#: ../BeremizIDE.py:455 +#: ../BeremizIDE.py:483 msgid "Beremiz" msgstr "Beremiz" @@ -700,85 +690,85 @@ msgid "Bitwise inverting" msgstr "按位“反向”" -#: ../editors/Viewer.py:584 ../editors/Viewer.py:2407 +#: ../editors/Viewer.py:621 ../editors/Viewer.py:2440 msgid "Block" msgstr "块" -#: ../dialogs/FBDBlockDialog.py:60 +#: ../dialogs/FBDBlockDialog.py:63 msgid "Block Properties" msgstr "块属性" -#: ../editors/TextViewer.py:262 +#: ../editors/TextViewer.py:260 msgid "Block name" msgstr "块名称" -#: ../editors/Viewer.py:550 +#: ../editors/Viewer.py:586 msgid "Bottom" msgstr "底部" -#: ../ProjectController.py:1363 +#: ../ProjectController.py:1400 msgid "Broken" msgstr "损坏" -#: ../dialogs/BrowseValuesLibraryDialog.py:38 +#: ../dialogs/BrowseValuesLibraryDialog.py:40 #, python-format msgid "Browse %s values library" msgstr "浏览 %s 值库" -#: ../dialogs/BrowseLocationsDialog.py:65 +#: ../dialogs/BrowseLocationsDialog.py:72 msgid "Browse Locations" msgstr "浏览定位" -#: ../ProjectController.py:1832 +#: ../ProjectController.py:1815 msgid "Build" msgstr "构建" -#: ../ProjectController.py:1297 +#: ../ProjectController.py:1335 msgid "Build directory already clean\n" msgstr "构建目录已经清除\n" -#: ../ProjectController.py:1833 +#: ../ProjectController.py:1816 msgid "Build project into build folder" msgstr "在构建文件夹中构建项目" -#: ../ProjectController.py:1080 +#: ../ProjectController.py:1108 msgid "C Build crashed !\n" msgstr "C构建损坏！\n" -#: ../ProjectController.py:1077 +#: ../ProjectController.py:1105 msgid "C Build failed.\n" msgstr "C构建失败。\n" -#: ../c_ext/CFileEditor.py:63 +#: ../c_ext/CFileEditor.py:66 msgid "C code" msgstr "C 代码" -#: ../ProjectController.py:1155 +#: ../ProjectController.py:1186 msgid "C code generated successfully.\n" msgstr "C代码生成成功。\n" -#: ../targets/toolchain_makefile.py:122 +#: ../targets/toolchain_makefile.py:126 msgid "C compilation failed.\n" msgstr "C编译失败。\n" -#: ../targets/toolchain_gcc.py:192 +#: ../targets/toolchain_gcc.py:199 #, python-format msgid "C compilation of %s failed.\n" msgstr " %s 的C编译失败。\n" -#: ../features.py:32 +#: ../features.py:33 msgid "C extension" msgstr "C扩展" -#: ../dialogs/AboutDialog.py:71 +#: ../dialogs/AboutDialog.py:69 msgid "C&redits" msgstr "C&redits" -#: ../canfestival/NetworkEditor.py:52 +#: ../canfestival/NetworkEditor.py:58 msgid "CANOpen network" msgstr "CANOpen 网络" -#: ../canfestival/SlaveEditor.py:44 +#: ../canfestival/SlaveEditor.py:48 msgid "CANOpen slave" msgstr "CANOpen 从站" @@ -786,34 +776,34 @@ msgid "CANopen support" msgstr "CANOpen 支持" -#: ../plcopen/plcopen.py:1589 ../plcopen/plcopen.py:1603 -#: ../plcopen/plcopen.py:1627 ../plcopen/plcopen.py:1643 +#: ../plcopen/plcopen.py:1839 ../plcopen/plcopen.py:1853 +#: ../plcopen/plcopen.py:1878 ../plcopen/plcopen.py:1894 msgid "Can only generate execution order on FBD networks!" msgstr "在功能块网络，只能生成执行命令！" -#: ../controls/VariablePanel.py:267 +#: ../controls/VariablePanel.py:291 msgid "Can only give a location to local or global variables" msgstr "只能影响本地或全局变量的位置" -#: ../PLCOpenEditor.py:344 +#: ../PLCOpenEditor.py:318 #, python-format msgid "Can't generate program to file %s!" msgstr "这个编程生成文件失败 %s！" -#: ../controls/VariablePanel.py:265 +#: ../controls/VariablePanel.py:289 msgid "Can't give a location to a function block instance" msgstr "不能影响功能块实例的位置" -#: ../PLCOpenEditor.py:389 +#: ../PLCOpenEditor.py:363 #, python-format msgid "Can't save project to file %s!" msgstr "这个项目保存为文件失败 %s！" -#: ../controls/VariablePanel.py:313 +#: ../controls/VariablePanel.py:339 msgid "Can't set an initial value to a function block instance" msgstr "不能设置一个初始值到一个功能块实例" -#: ../ConfigTreeNode.py:529 +#: ../ConfigTreeNode.py:532 #, python-brace-format msgid "Cannot create child {a1} of type {a2} " msgstr "不能创建类型 {a2} 的子类型 {a1} " @@ -823,46 +813,50 @@ msgid "Cannot find lower free IEC channel than %d\n" msgstr "无法找到比 %d 更低的自由的IEC通道\n" -#: ../connectors/PYRO/__init__.py:131 +#: ../connectors/PYRO/__init__.py:139 msgid "Cannot get PLC status - connection failed.\n" msgstr "无法获取PLC的状态 - 连接失败。\n" -#: ../ProjectController.py:943 +#: ../ProjectController.py:967 msgid "Cannot open/parse VARIABLES.csv!\n" msgstr "无法打开／解析 VARIABLES.csv！\n" -#: ../canfestival/config_utils.py:374 +#: ../canfestival/config_utils.py:400 #, python-brace-format msgid "" "Cannot set bit offset for non bool '{a1}' variable " "(ID:{a2},Idx:{a3},sIdx:{a4}))" msgstr "不能设置位偏移对于非布尔 '{a1}' 变量 (ID:{a2},Idx:{a3},sIdx:{a4}))" -#: ../dialogs/SearchInProjectDialog.py:59 ../dialogs/FindInPouDialog.py:86 +#: ../ProjectController.py:1761 +msgid "Cannot transfer while PLC is running. Stop it now?" +msgstr "在PLC运行时，不能传输！现在停止运行吗？" + +#: ../dialogs/SearchInProjectDialog.py:63 ../dialogs/FindInPouDialog.py:89 msgid "Case sensitive" msgstr "区分大小写" -#: ../editors/Viewer.py:545 +#: ../editors/Viewer.py:581 msgid "Center" msgstr "中" -#: ../Beremiz_service.py:268 +#: ../Beremiz_service.py:276 msgid "Change IP of interface to bind" msgstr "更改界面的ip用以绑定" -#: ../Beremiz_service.py:267 +#: ../Beremiz_service.py:275 msgid "Change Name" msgstr "更改名字" -#: ../IDEFrame.py:1946 +#: ../IDEFrame.py:1977 msgid "Change POU Type To" msgstr "将POU类型转换为" -#: ../Beremiz_service.py:269 +#: ../Beremiz_service.py:277 msgid "Change Port Number" msgstr "更改端口号" -#: ../Beremiz_service.py:270 +#: ../Beremiz_service.py:278 msgid "Change working directory" msgstr "更改工作目录" @@ -870,115 +864,119 @@ msgid "Character string" msgstr "字符串" -#: ../svgui/svgui.py:128 +#: ../svgui/svgui.py:136 msgid "Choose a SVG file" msgstr "选择一个SVG文件" -#: ../ProjectController.py:542 +#: ../ProjectController.py:561 msgid "Choose a directory to save project" msgstr "选择一个目录保存项目" -#: ../canfestival/canfestival.py:162 ../PLCOpenEditor.py:302 -#: ../PLCOpenEditor.py:334 ../PLCOpenEditor.py:383 +#: ../canfestival/canfestival.py:171 ../PLCOpenEditor.py:276 +#: ../PLCOpenEditor.py:308 ../PLCOpenEditor.py:357 msgid "Choose a file" msgstr "选择一个文件" -#: ../BeremizIDE.py:833 ../BeremizIDE.py:869 +#: ../BeremizIDE.py:900 msgid "Choose a project" msgstr "选择一个项目" -#: ../dialogs/BrowseValuesLibraryDialog.py:41 +#: ../dialogs/BrowseValuesLibraryDialog.py:43 #, python-format msgid "Choose a value for %s:" msgstr "这对 %s选择一个值：" -#: ../Beremiz_service.py:325 +#: ../Beremiz_service.py:333 msgid "Choose a working directory " msgstr "选择一个工作目录" -#: ../ProjectController.py:449 +#: ../BeremizIDE.py:864 +msgid "Choose an empty directory for new project" +msgstr "选择一个空白目录以保存项目" + +#: ../ProjectController.py:468 msgid "Chosen folder doesn't contain a program. It's not a valid project!" msgstr "被选中的文件夹未包含一个程序。它不是一个有效项目！" -#: ../ProjectController.py:416 +#: ../ProjectController.py:435 msgid "Chosen folder isn't empty. You can't use it for a new project!" msgstr "被选中的文件夹非空。你不能用它创建一个新项目！" -#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54 +#: ../controls/VariablePanel.py:60 msgid "Class" msgstr "分类" -#: ../controls/VariablePanel.py:441 +#: ../controls/VariablePanel.py:472 msgid "Class Filter:" msgstr "类过滤器：" -#: ../dialogs/FBDVariableDialog.py:70 +#: ../dialogs/FBDVariableDialog.py:74 msgid "Class:" msgstr "分类：" -#: ../ProjectController.py:1836 +#: ../ProjectController.py:1821 msgid "Clean" msgstr "清除" -#: ../controls/LogViewer.py:318 +#: ../controls/LogViewer.py:327 msgid "Clean log messages" msgstr "清楚记录信息" -#: ../ProjectController.py:1838 +#: ../ProjectController.py:1822 msgid "Clean project build folder" msgstr "清除项目构建目录" -#: ../ProjectController.py:1294 +#: ../ProjectController.py:1332 msgid "Cleaning the build directory\n" msgstr "清除构建目录\n" -#: ../IDEFrame.py:435 +#: ../IDEFrame.py:437 msgid "Clear Errors" msgstr "清楚错误" -#: ../editors/Viewer.py:641 +#: ../editors/Viewer.py:680 msgid "Clear Execution Order" msgstr "清空执行命令" -#: ../dialogs/SearchInProjectDialog.py:103 ../dialogs/FindInPouDialog.py:109 +#: ../dialogs/SearchInProjectDialog.py:107 ../dialogs/FindInPouDialog.py:112 msgid "Close" msgstr "关闭" -#: ../BeremizIDE.py:595 ../PLCOpenEditor.py:209 +#: ../BeremizIDE.py:627 ../PLCOpenEditor.py:183 msgid "Close Application" msgstr "关闭应用" -#: ../BeremizIDE.py:228 ../BeremizIDE.py:539 ../PLCOpenEditor.py:110 -#: ../IDEFrame.py:1013 +#: ../BeremizIDE.py:253 ../BeremizIDE.py:566 ../PLCOpenEditor.py:81 +#: ../IDEFrame.py:1040 msgid "Close Project" msgstr "关闭项目" -#: ../BeremizIDE.py:226 ../PLCOpenEditor.py:108 +#: ../BeremizIDE.py:251 ../PLCOpenEditor.py:79 msgid "Close Tab" msgstr "关闭标签" -#: ../editors/Viewer.py:600 ../editors/Viewer.py:2415 +#: ../editors/Viewer.py:638 ../editors/Viewer.py:2448 msgid "Coil" msgstr "线圈" -#: ../editors/Viewer.py:620 ../editors/LDViewer.py:506 +#: ../editors/Viewer.py:659 ../editors/LDViewer.py:517 msgid "Comment" msgstr "注释" -#: ../BeremizIDE.py:276 ../BeremizIDE.py:279 ../PLCOpenEditor.py:161 -#: ../PLCOpenEditor.py:164 +#: ../BeremizIDE.py:303 ../BeremizIDE.py:307 ../PLCOpenEditor.py:134 +#: ../PLCOpenEditor.py:138 msgid "Community support" msgstr "社区支持" -#: ../dialogs/ProjectDialog.py:60 +#: ../dialogs/ProjectDialog.py:65 msgid "Company Name" msgstr "公司名称" -#: ../controls/ProjectPropertiesPanel.py:95 +#: ../controls/ProjectPropertiesPanel.py:106 msgid "Company Name (required):" msgstr "公司名字（必须）：" -#: ../controls/ProjectPropertiesPanel.py:96 +#: ../controls/ProjectPropertiesPanel.py:107 msgid "Company URL (optional):" msgstr "公司网址（选填）：" @@ -986,7 +984,7 @@ msgid "Comparison" msgstr "比较" -#: ../ProjectController.py:734 +#: ../ProjectController.py:756 msgid "Compiling IEC Program into C code...\n" msgstr "正在将IEC程序编译成C代码...\n" @@ -994,93 +992,93 @@ msgid "Concatenation" msgstr "级联" -#: ../editors/ConfTreeNodeEditor.py:230 +#: ../editors/ConfTreeNodeEditor.py:241 msgid "Config" msgstr "配置" -#: ../editors/ProjectNodeEditor.py:36 +#: ../editors/ProjectNodeEditor.py:39 msgid "Config variables" msgstr "配置变量" -#: ../dialogs/SearchInProjectDialog.py:40 +#: ../dialogs/SearchInProjectDialog.py:43 msgid "Configuration" msgstr "配置" -#: ../PLCControler.py:99 +#: ../plcopen/types_enums.py:77 msgid "Configurations" msgstr "配置" -#: ../editors/Viewer.py:308 ../editors/Viewer.py:338 ../editors/Viewer.py:360 -#: ../editors/TextViewer.py:291 ../editors/TextViewer.py:342 -#: ../editors/TextViewer.py:365 ../controls/VariablePanel.py:328 +#: ../editors/Viewer.py:351 ../editors/Viewer.py:381 ../editors/Viewer.py:403 +#: ../editors/TextViewer.py:289 ../editors/TextViewer.py:343 +#: ../editors/TextViewer.py:366 ../controls/VariablePanel.py:354 msgid "Confirm or change variable name" msgstr "确认或变更变量名称" -#: ../ProjectController.py:1851 +#: ../ProjectController.py:1842 msgid "Connect" msgstr "连接" -#: ../ProjectController.py:1852 +#: ../ProjectController.py:1843 msgid "Connect to the target PLC" msgstr "连接到PLC目标" -#: ../ProjectController.py:1354 +#: ../ProjectController.py:1391 #, python-format msgid "Connected to URI: %s" msgstr "连接到URI： %s" -#: ../dialogs/SFCTransitionDialog.py:77 ../editors/Viewer.py:586 -#: ../editors/Viewer.py:2408 +#: ../dialogs/SFCTransitionDialog.py:78 ../editors/Viewer.py:623 +#: ../editors/Viewer.py:2441 msgid "Connection" msgstr "连接" -#: ../dialogs/ConnectionDialog.py:53 +#: ../dialogs/ConnectionDialog.py:55 msgid "Connection Properties" msgstr "连接属性" -#: ../ProjectController.py:1709 +#: ../ProjectController.py:1691 msgid "Connection canceled!\n" msgstr "取消连接！\n" -#: ../ProjectController.py:1734 +#: ../ProjectController.py:1714 #, python-format msgid "Connection failed to %s!\n" msgstr "连接失败 %s!\n" -#: ../connectors/PYRO/__init__.py:115 ../connectors/WAMP/__init__.py:111 +#: ../connectors/PYRO/__init__.py:123 ../connectors/WAMP/__init__.py:120 msgid "Connection lost!\n" msgstr "失去连接！\n" -#: ../connectors/PYRO/__init__.py:102 +#: ../connectors/PYRO/__init__.py:110 #, python-format msgid "Connection to '%s' failed.\n" msgstr "连接到 '%s' 失败。\n" -#: ../dialogs/ConnectionDialog.py:65 ../editors/Viewer.py:1643 +#: ../dialogs/ConnectionDialog.py:67 ../editors/Viewer.py:1676 msgid "Connector" msgstr "连接" -#: ../dialogs/SFCStepDialog.py:66 +#: ../dialogs/SFCStepDialog.py:68 msgid "Connectors:" msgstr "连接：" -#: ../BeremizIDE.py:350 +#: ../BeremizIDE.py:378 msgid "Console" msgstr "控制台" -#: ../controls/VariablePanel.py:60 +#: ../controls/VariablePanel.py:75 msgid "Constant" msgstr "常量" -#: ../editors/Viewer.py:596 ../editors/Viewer.py:2411 +#: ../editors/Viewer.py:634 ../editors/Viewer.py:2444 msgid "Contact" msgstr "连接" -#: ../controls/ProjectPropertiesPanel.py:198 +#: ../controls/ProjectPropertiesPanel.py:217 msgid "Content Description (optional):" msgstr "内容描述（选填）：" -#: ../dialogs/ConnectionDialog.py:66 ../editors/Viewer.py:1644 +#: ../dialogs/ConnectionDialog.py:68 ../editors/Viewer.py:1677 msgid "Continuation" msgstr "连续" @@ -1100,20 +1098,20 @@ msgid "Conversion to time-of-day" msgstr "转换为日期时间" -#: ../editors/Viewer.py:656 ../controls/LogViewer.py:704 ../IDEFrame.py:370 -#: ../IDEFrame.py:425 +#: ../editors/Viewer.py:695 ../controls/LogViewer.py:713 ../IDEFrame.py:372 +#: ../IDEFrame.py:427 msgid "Copy" msgstr "复制" -#: ../IDEFrame.py:1933 +#: ../IDEFrame.py:1964 msgid "Copy POU" msgstr "复制POU" -#: ../editors/FileManagementPanel.py:65 +#: ../editors/FileManagementPanel.py:68 msgid "Copy file from left folder to right" msgstr "从左侧文件夹中复制文件到右侧" -#: ../editors/FileManagementPanel.py:64 +#: ../editors/FileManagementPanel.py:67 msgid "Copy file from right folder to left" msgstr "从右侧文件夹中复制文件到左侧" @@ -1121,7 +1119,7 @@ msgid "Cosine" msgstr "余弦" -#: ../ConfigTreeNode.py:656 +#: ../ConfigTreeNode.py:660 #, python-brace-format msgid "" "Could not add child \"{a1}\", type {a2} :\n" @@ -1130,12 +1128,12 @@ "不能增加子 \"{a1}\"，类型 {a2} :\n" "{a3}\n" -#: ../py_ext/PythonFileCTNMixin.py:78 +#: ../py_ext/PythonFileCTNMixin.py:81 #, python-format msgid "Couldn't import old %s file." msgstr "不能导入旧 %s 文件。" -#: ../ConfigTreeNode.py:626 +#: ../ConfigTreeNode.py:630 #, python-brace-format msgid "" "Couldn't load confnode base parameters {a1} :\n" @@ -1144,7 +1142,7 @@ "不能加载 confnode 基础参数 {a1} ：\n" " {a2}" -#: ../ConfigTreeNode.py:643 ../CodeFileTreeNode.py:124 +#: ../ConfigTreeNode.py:647 ../CodeFileTreeNode.py:127 #, python-brace-format msgid "" "Couldn't load confnode parameters {a1} :\n" @@ -1153,111 +1151,107 @@ "不能加载 confnode 参数 {a1} ：\n" " {a2}" -#: ../PLCControler.py:948 +#: ../PLCControler.py:552 msgid "Couldn't paste non-POU object." msgstr "不能粘贴 非-POU 目标。" -#: ../ProjectController.py:1651 +#: ../ProjectController.py:1636 msgid "Couldn't start PLC !\n" msgstr "无法开始PLC！\n" -#: ../ProjectController.py:1659 +#: ../ProjectController.py:1644 msgid "Couldn't stop PLC !\n" msgstr "无法停止PLC！\n" -#: ../ProjectController.py:1623 -msgid "Couldn't stop debugger.\n" -msgstr "不能停止调试器。\n" - -#: ../svgui/svgui.py:49 +#: ../svgui/svgui.py:57 msgid "Create HMI" msgstr "新建 HMI" -#: ../dialogs/PouDialog.py:46 +#: ../dialogs/PouDialog.py:54 msgid "Create a new POU" msgstr "新建一个POU" -#: ../dialogs/PouActionDialog.py:38 +#: ../dialogs/PouActionDialog.py:45 msgid "Create a new action" msgstr "新建一个动作" -#: ../IDEFrame.py:159 +#: ../IDEFrame.py:166 msgid "Create a new action block" msgstr "新建一个动作控制功能块" -#: ../IDEFrame.py:108 ../IDEFrame.py:138 ../IDEFrame.py:171 +#: ../IDEFrame.py:115 ../IDEFrame.py:145 ../IDEFrame.py:178 msgid "Create a new block" msgstr "新建一个块" -#: ../IDEFrame.py:132 +#: ../IDEFrame.py:139 msgid "Create a new branch" msgstr "新建一个支流" -#: ../IDEFrame.py:126 +#: ../IDEFrame.py:133 msgid "Create a new coil" msgstr "新建一个线圈" -#: ../IDEFrame.py:102 ../IDEFrame.py:117 ../IDEFrame.py:147 +#: ../IDEFrame.py:109 ../IDEFrame.py:124 ../IDEFrame.py:154 msgid "Create a new comment" msgstr "新建一个备注" -#: ../IDEFrame.py:111 ../IDEFrame.py:141 ../IDEFrame.py:174 +#: ../IDEFrame.py:118 ../IDEFrame.py:148 ../IDEFrame.py:181 msgid "Create a new connection" msgstr "新建一个连接" -#: ../IDEFrame.py:129 ../IDEFrame.py:180 +#: ../IDEFrame.py:136 ../IDEFrame.py:187 msgid "Create a new contact" msgstr "新建一个接触点" -#: ../IDEFrame.py:162 +#: ../IDEFrame.py:169 msgid "Create a new divergence" msgstr "新建一个发散" -#: ../dialogs/SFCDivergenceDialog.py:53 +#: ../dialogs/SFCDivergenceDialog.py:54 msgid "Create a new divergence or convergence" msgstr "新建一个发散或者收敛" -#: ../IDEFrame.py:150 +#: ../IDEFrame.py:157 msgid "Create a new initial step" msgstr "新建一个初始步骤" -#: ../IDEFrame.py:165 +#: ../IDEFrame.py:172 msgid "Create a new jump" msgstr "新建一个跳跃" -#: ../IDEFrame.py:120 ../IDEFrame.py:177 +#: ../IDEFrame.py:127 ../IDEFrame.py:184 msgid "Create a new power rail" msgstr "新建一个电源导轨" -#: ../IDEFrame.py:123 +#: ../IDEFrame.py:130 msgid "Create a new rung" msgstr "新建一个梯级" -#: ../IDEFrame.py:153 +#: ../IDEFrame.py:160 msgid "Create a new step" msgstr "新建一个步骤" -#: ../dialogs/PouTransitionDialog.py:42 ../IDEFrame.py:156 +#: ../dialogs/PouTransitionDialog.py:49 ../IDEFrame.py:163 msgid "Create a new transition" msgstr "新建一个跃迁" -#: ../IDEFrame.py:105 ../IDEFrame.py:135 ../IDEFrame.py:168 +#: ../IDEFrame.py:112 ../IDEFrame.py:142 ../IDEFrame.py:175 msgid "Create a new variable" msgstr "新建一个变量" -#: ../dialogs/AboutDialog.py:113 +#: ../dialogs/AboutDialog.py:109 msgid "Credits" msgstr "关于作者" -#: ../Beremiz_service.py:434 +#: ../Beremiz_service.py:424 msgid "Current working directory :" msgstr "当前工作目录：" -#: ../editors/Viewer.py:655 ../IDEFrame.py:368 ../IDEFrame.py:424 +#: ../editors/Viewer.py:694 ../IDEFrame.py:370 ../IDEFrame.py:426 msgid "Cut" msgstr "剪切" -#: ../editors/ResourceEditor.py:72 +#: ../editors/ResourceEditor.py:81 msgid "Cyclic" msgstr "循环" @@ -1269,19 +1263,19 @@ msgid "DEPRECATED" msgstr "DEPRECATED" -#: ../canfestival/SlaveEditor.py:76 ../canfestival/NetworkEditor.py:97 +#: ../canfestival/SlaveEditor.py:80 ../canfestival/NetworkEditor.py:104 msgid "DS-301 Profile" msgstr "DS-301 配置" -#: ../canfestival/SlaveEditor.py:77 ../canfestival/NetworkEditor.py:98 +#: ../canfestival/SlaveEditor.py:81 ../canfestival/NetworkEditor.py:105 msgid "DS-302 Profile" msgstr "DS-302 配置" -#: ../dialogs/SearchInProjectDialog.py:36 +#: ../dialogs/SearchInProjectDialog.py:39 msgid "Data Type" msgstr "数据类型" -#: ../PLCControler.py:98 +#: ../plcopen/types_enums.py:76 msgid "Data Types" msgstr "数据类型 " @@ -1302,66 +1296,58 @@ msgid "Date subtraction" msgstr "日期减法" -#: ../dialogs/DurationEditorDialog.py:44 +#: ../dialogs/DurationEditorDialog.py:46 msgid "Days:" msgstr "日：" -#: ../ProjectController.py:1756 +#: ../ProjectController.py:1729 msgid "Debug does not match PLC - stop/transfert/start to re-enable\n" msgstr "调试部匹配PLC - 停止/传输/启动 来新启用\n" -#: ../controls/PouInstanceVariablesPanel.py:134 +#: ../controls/PouInstanceVariablesPanel.py:144 msgid "Debug instance" msgstr "调试实例" -#: ../editors/Viewer.py:448 +#: ../editors/Viewer.py:490 #, python-format msgid "Debug: %s" msgstr "调试：%s" -#: ../ProjectController.py:1412 +#: ../ProjectController.py:1471 #, python-format msgid "Debug: Unknown variable '%s'\n" msgstr "调试：未知变量 '%s'\n" -#: ../ProjectController.py:1410 +#: ../ProjectController.py:1469 #, python-format msgid "Debug: Unsupported type to debug '%s'\n" msgstr "调试：不支持的类型进行调试 '%s'\n" -#: ../IDEFrame.py:639 +#: ../IDEFrame.py:660 msgid "Debugger" msgstr "调试器" -#: ../ProjectController.py:1592 -msgid "Debugger disabled\n" -msgstr "调试器禁用\n" - -#: ../ProjectController.py:1753 +#: ../ProjectController.py:1726 msgid "Debugger ready\n" msgstr "调试器准备好\n" -#: ../ProjectController.py:1625 -msgid "Debugger stopped.\n" -msgstr "调试器停止。\n" - -#: ../BeremizIDE.py:968 ../editors/Viewer.py:631 ../IDEFrame.py:1962 +#: ../BeremizIDE.py:1004 ../editors/Viewer.py:670 ../IDEFrame.py:1993 msgid "Delete" msgstr "删除" -#: ../editors/Viewer.py:573 +#: ../editors/Viewer.py:610 msgid "Delete Divergence Branch" msgstr "删除发散分支" -#: ../editors/FileManagementPanel.py:153 +#: ../editors/FileManagementPanel.py:157 msgid "Delete File" msgstr "删除文件" -#: ../editors/Viewer.py:560 +#: ../editors/Viewer.py:597 msgid "Delete Wire Segment" msgstr "删除布线段" -#: ../controls/CustomEditableListBox.py:41 +#: ../controls/CustomEditableListBox.py:44 msgid "Delete item" msgstr "删除项目" @@ -1369,47 +1355,47 @@ msgid "Deletion (within)" msgstr "删除" -#: ../editors/DataTypeEditor.py:153 +#: ../editors/DataTypeEditor.py:161 msgid "Derivation Type:" msgstr "推导类型：" -#: ../editors/CodeFileEditor.py:739 +#: ../editors/CodeFileEditor.py:735 msgid "Description" msgstr "描述" -#: ../controls/VariablePanel.py:432 +#: ../controls/VariablePanel.py:463 msgid "Description:" msgstr "描述：" -#: ../dialogs/ArrayTypeDialog.py:60 ../editors/DataTypeEditor.py:321 +#: ../dialogs/ArrayTypeDialog.py:63 ../editors/DataTypeEditor.py:332 msgid "Dimensions:" msgstr "维数：" -#: ../dialogs/FindInPouDialog.py:66 +#: ../dialogs/FindInPouDialog.py:69 msgid "Direction" msgstr "方向" -#: ../dialogs/BrowseLocationsDialog.py:91 +#: ../dialogs/BrowseLocationsDialog.py:102 msgid "Direction:" msgstr "方向：" -#: ../editors/DataTypeEditor.py:54 +#: ../editors/DataTypeEditor.py:60 msgid "Directly" msgstr "直接的" -#: ../ProjectController.py:1860 +#: ../ProjectController.py:1855 msgid "Disconnect" msgstr "断开" -#: ../ProjectController.py:1862 +#: ../ProjectController.py:1856 msgid "Disconnect from PLC" msgstr "从PLC断开" -#: ../ProjectController.py:1364 +#: ../ProjectController.py:1401 msgid "Disconnected" msgstr "已断开" -#: ../editors/Viewer.py:615 ../editors/Viewer.py:2403 +#: ../editors/Viewer.py:654 ../editors/Viewer.py:2436 msgid "Divergence" msgstr "偏差" @@ -1417,120 +1403,120 @@ msgid "Division" msgstr "除法" -#: ../editors/FileManagementPanel.py:152 +#: ../editors/FileManagementPanel.py:156 #, python-format msgid "Do you really want to delete the file '%s'?" msgstr "你真的想删除这个文件 '%s' ？" -#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54 +#: ../controls/VariablePanel.py:65 msgid "Documentation" msgstr "文档" -#: ../PLCOpenEditor.py:338 +#: ../PLCOpenEditor.py:312 msgid "Done" msgstr "完成" -#: ../dialogs/ActionBlockDialog.py:39 +#: ../dialogs/ActionBlockDialog.py:42 msgid "Duration" msgstr "时间" -#: ../canfestival/canfestival.py:165 +#: ../canfestival/canfestival.py:174 msgid "EDS files (*.eds)|*.eds|All files|*.*" msgstr "EDS 文件 (*.eds)|*.eds|All files|*.*" -#: ../editors/Viewer.py:629 +#: ../editors/Viewer.py:668 msgid "Edit Block" msgstr "编辑块" -#: ../dialogs/LDElementDialog.py:56 +#: ../dialogs/LDElementDialog.py:58 msgid "Edit Coil Values" msgstr "编辑线圈值" -#: ../dialogs/LDElementDialog.py:54 +#: ../dialogs/LDElementDialog.py:56 msgid "Edit Contact Values" msgstr "编辑接触点值" -#: ../dialogs/DurationEditorDialog.py:59 +#: ../dialogs/DurationEditorDialog.py:62 msgid "Edit Duration" msgstr "编辑期间" -#: ../dialogs/SFCStepDialog.py:51 +#: ../dialogs/SFCStepDialog.py:53 msgid "Edit Step" msgstr "编辑步骤" -#: ../wxglade_hmi/wxglade_hmi.py:38 +#: ../wxglade_hmi/wxglade_hmi.py:45 msgid "Edit a WxWidgets GUI with WXGlade" msgstr "用 WXGlade 编辑一个 WxWidgets 用户图形界面" -#: ../dialogs/ActionBlockDialog.py:121 +#: ../dialogs/ActionBlockDialog.py:127 msgid "Edit action block properties" msgstr "编辑行动块属性" -#: ../dialogs/ArrayTypeDialog.py:44 +#: ../dialogs/ArrayTypeDialog.py:47 msgid "Edit array type properties" msgstr "编辑数组类型属性" -#: ../editors/Viewer.py:2626 ../editors/Viewer.py:3055 +#: ../editors/Viewer.py:2660 ../editors/Viewer.py:3102 msgid "Edit comment" msgstr "编辑注释" -#: ../editors/FileManagementPanel.py:66 +#: ../editors/FileManagementPanel.py:69 msgid "Edit file" msgstr "编辑文件" -#: ../controls/CustomEditableListBox.py:39 +#: ../controls/CustomEditableListBox.py:42 msgid "Edit item" msgstr "编辑项目" -#: ../editors/Viewer.py:3014 +#: ../editors/Viewer.py:3059 msgid "Edit jump target" msgstr "编辑跳跃目标" -#: ../ProjectController.py:1874 +#: ../ProjectController.py:1873 msgid "Edit raw IEC code added to code generated by PLCGenerator" msgstr "编辑原始的IEC代码添加至PLCGenerator生成的代码" -#: ../editors/SFCViewer.py:799 +#: ../editors/SFCViewer.py:815 msgid "Edit step name" msgstr "编辑步骤名称" -#: ../dialogs/SFCTransitionDialog.py:52 +#: ../dialogs/SFCTransitionDialog.py:53 msgid "Edit transition" msgstr "编辑跃迁" -#: ../IDEFrame.py:611 +#: ../IDEFrame.py:632 msgid "Editor ToolBar" msgstr "编辑工具栏" -#: ../ProjectController.py:1257 +#: ../ProjectController.py:1294 msgid "Editor selection" msgstr "编辑选择" -#: ../editors/DataTypeEditor.py:348 +#: ../editors/DataTypeEditor.py:360 msgid "Elements :" msgstr "元素：" -#: ../ProjectController.py:1362 +#: ../ProjectController.py:1399 msgid "Empty" msgstr "空的" -#: ../IDEFrame.py:365 -msgid "Enable Undo/Redo" -msgstr "启用 取消/重做" - -#: ../Beremiz_service.py:333 +#: ../dialogs/ArrayTypeDialog.py:100 +msgid "Empty dimension isn't allowed." +msgstr "不允许空维度。" + +#: ../Beremiz_service.py:341 msgid "Enter a name " msgstr "输入一个名字" -#: ../Beremiz_service.py:318 +#: ../Beremiz_service.py:326 msgid "Enter a port number " msgstr "输入一个端口号" -#: ../Beremiz_service.py:309 +#: ../Beremiz_service.py:317 msgid "Enter the IP of the interface to bind" msgstr "输入界面的ip用以绑定" -#: ../editors/DataTypeEditor.py:54 +#: ../editors/DataTypeEditor.py:60 msgid "Enumerated" msgstr "列举的" @@ -1538,48 +1524,47 @@ msgid "Equal to" msgstr "等于" -#: ../BeremizIDE.py:1107 ../dialogs/ForceVariableDialog.py:197 -#: ../dialogs/SearchInProjectDialog.py:168 ../dialogs/SFCStepNameDialog.py:60 -#: ../dialogs/DurationEditorDialog.py:121 -#: ../dialogs/DurationEditorDialog.py:167 -#: ../dialogs/PouTransitionDialog.py:107 ../dialogs/BlockPreviewDialog.py:237 -#: ../dialogs/ProjectDialog.py:74 ../dialogs/ArrayTypeDialog.py:97 -#: ../dialogs/ArrayTypeDialog.py:103 ../dialogs/PouNameDialog.py:54 -#: ../dialogs/BrowseLocationsDialog.py:218 -#: ../dialogs/BrowseValuesLibraryDialog.py:83 -#: ../dialogs/PouActionDialog.py:105 ../dialogs/PouDialog.py:135 -#: ../PLCOpenEditor.py:345 ../PLCOpenEditor.py:350 ../PLCOpenEditor.py:430 -#: ../PLCOpenEditor.py:440 ../editors/ResourceEditor.py:436 -#: ../editors/Viewer.py:424 ../editors/LDViewer.py:666 -#: ../editors/LDViewer.py:882 ../editors/LDViewer.py:886 -#: ../editors/DataTypeEditor.py:550 ../editors/DataTypeEditor.py:555 -#: ../editors/DataTypeEditor.py:574 ../editors/DataTypeEditor.py:743 -#: ../editors/DataTypeEditor.py:750 ../editors/TextViewer.py:389 -#: ../editors/CodeFileEditor.py:762 ../ProjectController.py:372 -#: ../ProjectController.py:512 ../ProjectController.py:519 -#: ../controls/FolderTree.py:217 -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:166 -#: ../controls/DebugVariablePanel/DebugVariableTextViewer.py:137 -#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:231 -#: ../controls/VariablePanel.py:402 ../controls/VariablePanel.py:759 -#: ../IDEFrame.py:1007 ../IDEFrame.py:1617 ../IDEFrame.py:1658 -#: ../IDEFrame.py:1663 ../IDEFrame.py:1677 ../IDEFrame.py:1682 -#: ../Beremiz_service.py:213 +#: ../dialogs/ForceVariableDialog.py:213 +#: ../dialogs/SearchInProjectDialog.py:172 ../dialogs/SFCStepNameDialog.py:64 +#: ../dialogs/DurationEditorDialog.py:124 +#: ../dialogs/DurationEditorDialog.py:170 +#: ../dialogs/PouTransitionDialog.py:114 ../dialogs/BlockPreviewDialog.py:237 +#: ../dialogs/ProjectDialog.py:80 ../dialogs/ArrayTypeDialog.py:114 +#: ../dialogs/PouNameDialog.py:58 ../dialogs/BrowseLocationsDialog.py:229 +#: ../dialogs/BrowseValuesLibraryDialog.py:87 +#: ../dialogs/PouActionDialog.py:112 ../dialogs/PouDialog.py:143 +#: ../PLCOpenEditor.py:319 ../PLCOpenEditor.py:324 +#: ../editors/ResourceEditor.py:470 ../editors/Viewer.py:467 +#: ../editors/LDViewer.py:677 ../editors/LDViewer.py:893 +#: ../editors/LDViewer.py:897 ../editors/DataTypeEditor.py:566 +#: ../editors/DataTypeEditor.py:571 ../editors/DataTypeEditor.py:590 +#: ../editors/DataTypeEditor.py:759 ../editors/DataTypeEditor.py:766 +#: ../editors/TextViewer.py:390 ../editors/CodeFileEditor.py:760 +#: ../ProjectController.py:391 ../ProjectController.py:531 +#: ../ProjectController.py:538 ../controls/FolderTree.py:222 +#: ../controls/ProjectPropertiesPanel.py:306 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:173 +#: ../controls/DebugVariablePanel/DebugVariableTextViewer.py:138 +#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:227 +#: ../controls/VariablePanel.py:431 ../controls/VariablePanel.py:773 +#: ../util/ExceptionHandler.py:70 ../IDEFrame.py:1036 ../IDEFrame.py:1650 +#: ../IDEFrame.py:1691 ../IDEFrame.py:1696 ../IDEFrame.py:1710 +#: ../IDEFrame.py:1715 ../Beremiz_service.py:221 msgid "Error" msgstr "错误" -#: ../ProjectController.py:789 +#: ../ProjectController.py:811 msgid "" "Error : At least one configuration and one resource must be declared in PLC " "!\n" msgstr "错误：在PLC中，必须申明至少一个配置和一个资源！\n" -#: ../ProjectController.py:781 +#: ../ProjectController.py:803 #, python-format msgid "Error : IEC to C compiler returned %d\n" msgstr "错误：IEC到C编译器返回 %d\n" -#: ../ProjectController.py:712 +#: ../ProjectController.py:731 #, python-format msgid "" "Error in ST/IL/SFC code generator :\n" @@ -1588,37 +1573,44 @@ "错误在ST/IL/SFC代码生成器中：\n" "%s\n" -#: ../ConfigTreeNode.py:216 +#: ../ConfigTreeNode.py:219 #, python-format msgid "Error while saving \"%s\"\n" msgstr "存储时有错误 \"%s\"\n" -#: ../canfestival/canfestival.py:170 +#: ../canfestival/canfestival.py:179 msgid "Error: Export slave failed\n" msgstr "错误：导出从站失败\n" -#: ../canfestival/canfestival.py:371 +#: ../modbus/modbus.py:601 +#, python-brace-format +msgid "" +"Error: Modbus/IP Servers %{a1}.x and %{a2}.x use the same port number " +"{a3}.\n" +msgstr "错误: Modbus/IP 服务器 %{a1}.x 和 %{a2}.x 使用相同的端口号 {a3}.\n" + +#: ../canfestival/canfestival.py:388 msgid "Error: No Master generated\n" msgstr "错误：没有主控生成\n" -#: ../canfestival/canfestival.py:366 +#: ../canfestival/canfestival.py:383 msgid "Error: No PLC built\n" msgstr "错误：没有PLC构建\n" -#: ../ProjectController.py:1728 +#: ../ProjectController.py:1708 #, python-format msgid "Exception while connecting %s!\n" msgstr "连接时存在异常 %s!\n" -#: ../dialogs/FBDBlockDialog.py:120 +#: ../dialogs/FBDBlockDialog.py:123 msgid "Execution Control:" msgstr "执行控制：" -#: ../dialogs/FBDVariableDialog.py:80 ../dialogs/FBDBlockDialog.py:108 +#: ../dialogs/FBDVariableDialog.py:84 ../dialogs/FBDBlockDialog.py:111 msgid "Execution Order:" msgstr "执行命令：" -#: ../features.py:35 +#: ../features.py:36 msgid "Experimental web based HMI" msgstr "实验性的WEB基础的HMI" @@ -1630,77 +1622,77 @@ msgid "Exponentiation" msgstr "幂" -#: ../canfestival/canfestival.py:176 +#: ../canfestival/canfestival.py:186 msgid "Export CanOpen slave to EDS file" msgstr "导出 CANOpen 从站到 EDS 文件" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:243 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:246 msgid "Export graph values to clipboard" msgstr "导出图形值到剪切板" -#: ../canfestival/canfestival.py:175 +#: ../canfestival/canfestival.py:185 msgid "Export slave" msgstr "导出从站" -#: ../dialogs/FBDVariableDialog.py:90 +#: ../dialogs/FBDVariableDialog.py:94 msgid "Expression:" msgstr "表达式：" -#: ../controls/VariablePanel.py:72 +#: ../controls/VariablePanel.py:90 msgid "External" msgstr "外部的" -#: ../ProjectController.py:802 +#: ../ProjectController.py:826 msgid "Extracting Located Variables...\n" msgstr "正在提取位置变量......\n" -#: ../dialogs/PouTransitionDialog.py:36 ../dialogs/PouActionDialog.py:32 -#: ../dialogs/PouDialog.py:37 ../controls/ProjectPropertiesPanel.py:144 +#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:36 +#: ../dialogs/PouDialog.py:44 ../controls/ProjectPropertiesPanel.py:158 msgid "FBD" msgstr "功能块图" -#: ../ProjectController.py:1791 +#: ../ProjectController.py:1773 msgid "Failed : Must build before transfer.\n" msgstr "失败：传输之前必须构建。\n" -#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:521 +#: ../dialogs/LDElementDialog.py:80 ../editors/Viewer.py:556 msgid "Falling Edge" msgstr "下降沿" -#: ../ProjectController.py:1070 +#: ../ProjectController.py:1098 msgid "Fatal : cannot get builder.\n" msgstr "致命错误：无法获取构建者。\n" -#: ../Beremiz.py:156 +#: ../Beremiz.py:160 #, python-format msgid "Fetching %s" msgstr "抓取 %s" -#: ../dialogs/DurationEditorDialog.py:164 +#: ../dialogs/DurationEditorDialog.py:167 #, python-format msgid "Field %s hasn't a valid value!" msgstr "领域 %s 没有一个有效值！" -#: ../dialogs/DurationEditorDialog.py:166 +#: ../dialogs/DurationEditorDialog.py:169 #, python-format msgid "Fields %s haven't a valid value!" msgstr "领域 %s 没有一个有效值！" -#: ../controls/FolderTree.py:216 +#: ../controls/FolderTree.py:221 #, python-format msgid "File '%s' already exists!" msgstr "文件 '%s' 已经存在！" -#: ../dialogs/SearchInProjectDialog.py:98 ../dialogs/FindInPouDialog.py:37 -#: ../dialogs/FindInPouDialog.py:104 ../IDEFrame.py:375 +#: ../dialogs/SearchInProjectDialog.py:102 ../dialogs/FindInPouDialog.py:40 +#: ../dialogs/FindInPouDialog.py:107 ../IDEFrame.py:377 msgid "Find" msgstr "查找" -#: ../IDEFrame.py:377 +#: ../IDEFrame.py:379 msgid "Find Next" msgstr "查找下一个" -#: ../IDEFrame.py:379 +#: ../IDEFrame.py:381 msgid "Find Previous" msgstr "查找前一个" @@ -1708,93 +1700,89 @@ msgid "Find position" msgstr "查找位置" -#: ../dialogs/FindInPouDialog.py:55 +#: ../dialogs/FindInPouDialog.py:58 msgid "Find:" msgstr "查找：" -#: ../connectors/PYRO/__init__.py:163 -msgid "Force runtime reload\n" -msgstr "强制运行时重新加载\n" - -#: ../editors/Viewer.py:1600 +#: ../editors/Viewer.py:1633 msgid "Force value" msgstr "强制值" -#: ../dialogs/ForceVariableDialog.py:162 +#: ../dialogs/ForceVariableDialog.py:176 msgid "Forcing Variable Value" msgstr "强制变量值" -#: ../dialogs/SFCTransitionDialog.py:182 ../dialogs/PouTransitionDialog.py:97 -#: ../dialogs/ProjectDialog.py:73 ../dialogs/PouActionDialog.py:95 -#: ../dialogs/PouDialog.py:117 +#: ../dialogs/SFCTransitionDialog.py:184 ../dialogs/PouTransitionDialog.py:104 +#: ../dialogs/ProjectDialog.py:79 ../dialogs/PouActionDialog.py:102 +#: ../dialogs/PouDialog.py:125 #, python-format msgid "Form isn't complete. %s must be filled!" msgstr "形式不完整。%s 必须被填补完整！" -#: ../dialogs/SFCStepDialog.py:147 ../dialogs/FBDBlockDialog.py:236 -#: ../dialogs/ConnectionDialog.py:163 +#: ../dialogs/SFCStepDialog.py:150 ../dialogs/FBDBlockDialog.py:239 +#: ../dialogs/ConnectionDialog.py:166 msgid "Form isn't complete. Name must be filled!" msgstr "形式不完整。%s 名字必须填！" -#: ../dialogs/FBDBlockDialog.py:232 +#: ../dialogs/FBDBlockDialog.py:235 msgid "Form isn't complete. Valid block type must be selected!" msgstr "形式不完整。%s 有效的块类型必须被选择！" -#: ../dialogs/FindInPouDialog.py:72 +#: ../dialogs/FindInPouDialog.py:75 msgid "Forward" msgstr "向前的" -#: ../dialogs/SearchInProjectDialog.py:37 ../IDEFrame.py:1749 +#: ../dialogs/SearchInProjectDialog.py:40 ../IDEFrame.py:1780 msgid "Function" msgstr "功能" -#: ../IDEFrame.py:349 +#: ../IDEFrame.py:354 msgid "Function &Block" msgstr "功能 &块" -#: ../dialogs/SearchInProjectDialog.py:38 ../IDEFrame.py:1748 -#: ../IDEFrame.py:1941 +#: ../dialogs/SearchInProjectDialog.py:41 ../IDEFrame.py:1779 +#: ../IDEFrame.py:1972 msgid "Function Block" msgstr "功能块" -#: ../controls/VariablePanel.py:854 +#: ../controls/VariablePanel.py:868 msgid "Function Block Types" msgstr "功能块类型" -#: ../PLCControler.py:97 +#: ../plcopen/types_enums.py:75 msgid "Function Blocks" msgstr "功能块" -#: ../editors/Viewer.py:249 +#: ../editors/Viewer.py:290 msgid "Function Blocks can't be used in Functions!" msgstr "功能块不能用于功能中！" -#: ../PLCControler.py:2343 +#: ../PLCControler.py:1907 #, python-format msgid "FunctionBlock \"%s\" can't be pasted in a Function!!!" msgstr "功能块 \"%s\" 不能用于功能中！" -#: ../PLCControler.py:97 +#: ../plcopen/types_enums.py:75 msgid "Functions" msgstr "功能" -#: ../PLCOpenEditor.py:117 +#: ../PLCOpenEditor.py:88 msgid "Generate Program" msgstr "生成程序" -#: ../ProjectController.py:703 +#: ../ProjectController.py:722 msgid "Generating SoftPLC IEC-61131 ST/IL/SFC code...\n" msgstr "生成软PLC IEC-61131 ST/IL/SFC 代码......\n" -#: ../controls/VariablePanel.py:73 +#: ../controls/VariablePanel.py:91 msgid "Global" msgstr "全球的" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:242 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:245 msgid "Go to current value" msgstr "定位当前值" -#: ../controls/ProjectPropertiesPanel.py:174 +#: ../controls/ProjectPropertiesPanel.py:189 msgid "Graphics" msgstr "图形" @@ -1806,110 +1794,114 @@ msgid "Greater than or equal to" msgstr "大于或等于" -#: ../controls/ProjectPropertiesPanel.py:135 +#: ../controls/ProjectPropertiesPanel.py:149 msgid "Grid Resolution:" msgstr "栅格分辨率：" -#: ../runtime/NevowServer.py:182 +#: ../runtime/NevowServer.py:192 msgid "HTTP interface port :" msgstr "HTTP 界面端口：" -#: ../controls/ProjectPropertiesPanel.py:121 +#: ../controls/ProjectPropertiesPanel.py:135 msgid "Height:" msgstr "高度：" -#: ../editors/FileManagementPanel.py:85 +#: ../editors/FileManagementPanel.py:89 msgid "Home Directory:" msgstr "主目录" -#: ../controls/ProjectPropertiesPanel.py:151 +#: ../controls/ProjectPropertiesPanel.py:165 msgid "Horizontal:" msgstr "水平：" -#: ../dialogs/DurationEditorDialog.py:45 +#: ../dialogs/DurationEditorDialog.py:47 msgid "Hours:" msgstr "小时：" -#: ../dialogs/PouTransitionDialog.py:36 ../dialogs/PouActionDialog.py:32 -#: ../dialogs/PouDialog.py:37 +#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:36 +#: ../dialogs/PouDialog.py:44 msgid "IL" msgstr "指令表编程语言" -#: ../dialogs/DiscoveryDialog.py:94 +#: ../dialogs/DiscoveryDialog.py:91 msgid "IP" msgstr "IP" -#: ../Beremiz_service.py:310 ../Beremiz_service.py:311 +#: ../Beremiz_service.py:318 ../Beremiz_service.py:320 msgid "IP is not valid!" msgstr "IP 无效！" -#: ../svgui/svgui.py:44 ../svgui/svgui.py:45 +#: ../svgui/svgui.py:50 ../svgui/svgui.py:51 msgid "Import SVG" msgstr "导入 SVG" -#: ../dialogs/FBDVariableDialog.py:39 ../editors/Viewer.py:1629 -#: ../controls/VariablePanel.py:71 +#: ../dialogs/FBDVariableDialog.py:41 ../editors/Viewer.py:1662 +#: ../controls/VariablePanel.py:89 msgid "InOut" msgstr "输入输出" -#: ../editors/Viewer.py:431 +#: ../PLCGenerator.py:1040 +#, python-brace-format +msgid "InOut variable {a1} in block {a2} in POU {a3} must be connected." +msgstr "InOut 变量 {a1} 在块 {a2} 在 POU{a3} 必须被连接." + +#: ../editors/Viewer.py:473 msgid "Inactive" msgstr "不活动" -#: ../controls/VariablePanel.py:276 +#: ../controls/VariablePanel.py:300 #, python-brace-format msgid "Incompatible data types between \"{a1}\" and \"{a2}\"" msgstr " \"{a1}\" 和 \"{a2}\" 数据类型不相容" -#: ../controls/VariablePanel.py:282 +#: ../controls/VariablePanel.py:306 #, python-format msgid "Incompatible size of data between \"%s\" and \"BOOL\"" msgstr " \"%s\" 和 \"BOOL\" 数据尺寸不相容" -#: ../controls/VariablePanel.py:286 +#: ../controls/VariablePanel.py:310 #, python-brace-format msgid "Incompatible size of data between \"{a1}\" and \"{a2}\"" msgstr " \"{a1}\" 和 \"{a2}\" 数据尺寸不相容" -#: ../dialogs/ActionBlockDialog.py:39 +#: ../dialogs/ActionBlockDialog.py:42 msgid "Indicator" msgstr "指示器" -#: ../editors/CodeFileEditor.py:739 +#: ../editors/CodeFileEditor.py:734 msgid "Initial" msgstr "初始的" -#: ../editors/Viewer.py:611 +#: ../editors/Viewer.py:650 msgid "Initial Step" msgstr "初始的步" -#: ../editors/DataTypeEditor.py:50 ../controls/VariablePanel.py:53 -#: ../controls/VariablePanel.py:54 +#: ../editors/DataTypeEditor.py:55 ../controls/VariablePanel.py:63 msgid "Initial Value" msgstr "初始值" -#: ../editors/DataTypeEditor.py:185 ../editors/DataTypeEditor.py:216 -#: ../editors/DataTypeEditor.py:272 ../editors/DataTypeEditor.py:310 +#: ../editors/DataTypeEditor.py:193 ../editors/DataTypeEditor.py:224 +#: ../editors/DataTypeEditor.py:281 ../editors/DataTypeEditor.py:320 msgid "Initial Value:" msgstr "初始值：" -#: ../svgui/svgui.py:48 +#: ../svgui/svgui.py:56 msgid "Inkscape" msgstr "Inkscape" -#: ../dialogs/SFCTransitionDialog.py:76 ../dialogs/ActionBlockDialog.py:43 +#: ../dialogs/SFCTransitionDialog.py:77 ../dialogs/ActionBlockDialog.py:47 msgid "Inline" msgstr "在线" -#: ../dialogs/SFCStepDialog.py:71 ../dialogs/FBDVariableDialog.py:38 -#: ../dialogs/BrowseLocationsDialog.py:41 ../editors/Viewer.py:290 -#: ../editors/Viewer.py:1627 ../editors/TextViewer.py:307 -#: ../controls/LocationCellEditor.py:98 ../controls/VariablePanel.py:71 -#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351 +#: ../dialogs/SFCStepDialog.py:73 ../dialogs/FBDVariableDialog.py:40 +#: ../dialogs/BrowseLocationsDialog.py:43 ../editors/Viewer.py:333 +#: ../editors/Viewer.py:1660 ../editors/TextViewer.py:307 +#: ../controls/LocationCellEditor.py:103 ../controls/VariablePanel.py:89 +#: ../controls/VariablePanel.py:317 ../controls/VariablePanel.py:380 msgid "Input" msgstr "输入" -#: ../dialogs/FBDBlockDialog.py:96 +#: ../dialogs/FBDBlockDialog.py:99 msgid "Inputs:" msgstr "输入：" @@ -1917,64 +1909,72 @@ msgid "Insertion (into)" msgstr "插入" -#: ../plcopen/plcopen.py:1696 +#: ../plcopen/plcopen.py:1948 #, python-format msgid "Instance with id %d doesn't exist!" msgstr "有id的实例 %d 尚不存在！" -#: ../editors/ResourceEditor.py:264 +#: ../editors/ResourceEditor.py:279 msgid "Instances:" msgstr "实例：" -#: ../controls/VariablePanel.py:70 +#: ../controls/VariablePanel.py:88 msgid "Interface" msgstr "界面" -#: ../editors/ResourceEditor.py:72 +#: ../editors/ResourceEditor.py:81 msgid "Interrupt" msgstr "中断" -#: ../editors/ResourceEditor.py:68 +#: ../editors/ResourceEditor.py:76 msgid "Interval" msgstr "区间" -#: ../PLCControler.py:2331 +#: ../controls/ProjectPropertiesPanel.py:304 +msgid "" +"Invalid URL!\n" +"Please enter correct URL address." +msgstr "" +"无效的URL!\n" +"请输入正确的URL地址." + +#: ../PLCControler.py:1895 msgid "Invalid plcopen element(s)!!!" msgstr "无效的plcopen元素！！！" -#: ../canfestival/config_utils.py:381 +#: ../canfestival/config_utils.py:407 #, python-brace-format -msgid "Invalid type \"{a1}\"-> {a2} != {a3} for location\"{a4}\"" -msgstr "无效类型 \"{a1}\"-> {a2} != {a3} 对于定位 \"{a4}\"" - -#: ../canfestival/config_utils.py:645 +msgid "Invalid type \"{a1}\"-> {a2} != {a3} for location \"{a4}\"" +msgstr "无效类型 \"{a1}\"-> {a2} != {a3} 对于定位 \"{a4}\"" + +#: ../canfestival/config_utils.py:689 #, python-brace-format msgid "Invalid type \"{a1}\"-> {a2} != {a3} for location \"{a4}\"" msgstr "无效类型 \"{a1}\"-> {a2} != {a3} 对于定位 \"{a4}\"" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:132 -#: ../controls/DebugVariablePanel/DebugVariableTextViewer.py:92 -#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:166 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:139 +#: ../controls/DebugVariablePanel/DebugVariableTextViewer.py:93 +#: ../controls/DebugVariablePanel/DebugVariableGraphicViewer.py:162 #, python-format msgid "Invalid value \"%s\" for debug variable" msgstr "无效值 \"%s\" 为调试变量" -#: ../controls/VariablePanel.py:255 ../controls/VariablePanel.py:258 +#: ../controls/VariablePanel.py:279 ../controls/VariablePanel.py:282 #, python-format msgid "Invalid value \"%s\" for variable grid element" msgstr "无效值 \"%s\" 对于变量网格元素" -#: ../editors/Viewer.py:234 ../editors/Viewer.py:237 +#: ../editors/Viewer.py:276 ../editors/Viewer.py:279 #, python-format msgid "Invalid value \"%s\" for viewer block" msgstr "无效值 \"%s\" 在视窗块" -#: ../dialogs/ForceVariableDialog.py:195 +#: ../dialogs/ForceVariableDialog.py:211 #, python-brace-format msgid "Invalid value \"{a1}\" for \"{a2}\" variable!" msgstr "无效值 \"{a1}\" 对于 \"{a2}\" 变量！" -#: ../dialogs/DurationEditorDialog.py:121 +#: ../dialogs/DurationEditorDialog.py:124 msgid "" "Invalid value!\n" "You must fill a numeric value." @@ -1982,51 +1982,55 @@ "无效值！\n" "你必须填入一个数字值。" -#: ../editors/Viewer.py:616 ../editors/Viewer.py:2392 +#: ../connectors/WAMP/dialog.py:38 +msgid "Is connection secure?" +msgstr "是安全连接吗？" + +#: ../editors/Viewer.py:655 ../editors/Viewer.py:2425 msgid "Jump" msgstr "跳转" -#: ../dialogs/PouTransitionDialog.py:36 ../dialogs/PouActionDialog.py:32 -#: ../dialogs/PouDialog.py:37 ../controls/ProjectPropertiesPanel.py:144 +#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:36 +#: ../dialogs/PouDialog.py:44 ../controls/ProjectPropertiesPanel.py:158 msgid "LD" msgstr "梯级图" -#: ../editors/LDViewer.py:215 ../editors/LDViewer.py:231 +#: ../editors/LDViewer.py:221 ../editors/LDViewer.py:240 #, python-format msgid "Ladder element with id %d is on more than one rung." msgstr "有id的梯形元素 %d 不止在一个梯级上。" -#: ../dialogs/PouTransitionDialog.py:86 ../dialogs/PouActionDialog.py:84 -#: ../dialogs/PouDialog.py:105 +#: ../dialogs/PouTransitionDialog.py:93 ../dialogs/PouActionDialog.py:91 +#: ../dialogs/PouDialog.py:113 msgid "Language" msgstr "语言" -#: ../controls/ProjectPropertiesPanel.py:187 +#: ../controls/ProjectPropertiesPanel.py:206 msgid "Language (optional):" msgstr "语言（选填）：" -#: ../dialogs/PouTransitionDialog.py:60 ../dialogs/PouActionDialog.py:56 -#: ../dialogs/PouDialog.py:73 +#: ../dialogs/PouTransitionDialog.py:67 ../dialogs/PouActionDialog.py:63 +#: ../dialogs/PouDialog.py:81 msgid "Language:" msgstr "语言：" -#: ../ProjectController.py:1797 +#: ../ProjectController.py:1779 msgid "Latest build already matches current target. Transfering anyway...\n" msgstr "最新构建已经与当前目标匹配。正在传输中......\n" -#: ../Beremiz_service.py:273 +#: ../Beremiz_service.py:281 msgid "Launch WX GUI inspector" msgstr "启动 WX GUI 检查员" -#: ../Beremiz_service.py:272 +#: ../Beremiz_service.py:280 msgid "Launch a live Python shell" msgstr "启动一个活的Python Shell" -#: ../editors/Viewer.py:544 +#: ../editors/Viewer.py:580 msgid "Left" msgstr "左" -#: ../dialogs/LDPowerRailDialog.py:63 +#: ../dialogs/LDPowerRailDialog.py:64 msgid "Left PowerRail" msgstr "左电源导轨" @@ -2042,11 +2046,11 @@ msgid "Less than or equal to" msgstr "小于或等于" -#: ../IDEFrame.py:631 +#: ../IDEFrame.py:652 msgid "Library" msgstr "库" -#: ../dialogs/AboutDialog.py:151 +#: ../dialogs/AboutDialog.py:145 msgid "License" msgstr "许可" @@ -2054,27 +2058,27 @@ msgid "Limitation" msgstr "限制" -#: ../targets/toolchain_gcc.py:202 +#: ../targets/toolchain_gcc.py:209 msgid "Linking :\n" msgstr "链接：\n" -#: ../dialogs/DiscoveryDialog.py:112 ../controls/VariablePanel.py:72 +#: ../dialogs/DiscoveryDialog.py:115 ../controls/VariablePanel.py:90 msgid "Local" msgstr "本地" -#: ../canfestival/canfestival.py:348 +#: ../canfestival/canfestival.py:359 msgid "Local entries" msgstr "本地入口" -#: ../ProjectController.py:1703 +#: ../ProjectController.py:1685 msgid "Local service discovery failed!\n" msgstr "本地服务探索失败！\n" -#: ../controls/VariablePanel.py:53 +#: ../controls/VariablePanel.py:62 msgid "Location" msgstr "位置" -#: ../dialogs/BrowseLocationsDialog.py:72 +#: ../dialogs/BrowseLocationsDialog.py:79 msgid "Locations available:" msgstr "存在的定位：" @@ -2082,12 +2086,12 @@ msgid "Logarithm to base 10" msgstr "底数10的对数" -#: ../connectors/PYRO/__init__.py:94 +#: ../connectors/PYRO/__init__.py:102 #, python-format msgid "MDNS resolution failure for '%s'\n" msgstr "MDNS 解析度失败因为 '%s'\n" -#: ../canfestival/SlaveEditor.py:64 ../canfestival/NetworkEditor.py:85 +#: ../canfestival/SlaveEditor.py:68 ../canfestival/NetworkEditor.py:92 msgid "Map Variable" msgstr "映射变量" @@ -2095,11 +2099,15 @@ msgid "Map located variables over CANopen" msgstr "通过CANopen映射位置变量" -#: ../canfestival/NetworkEditor.py:106 +#: ../features.py:32 +msgid "Map located variables over Modbus" +msgstr "通过Modbus定位变量" + +#: ../canfestival/NetworkEditor.py:113 msgid "Master" msgstr "主站" -#: ../ConfigTreeNode.py:539 +#: ../ConfigTreeNode.py:544 #, python-brace-format msgid "Max count ({a1}) reached for this confnode of type {a2} " msgstr "最大计数 ({a1}) 达到了对于类型 {a2} 这个confnode" @@ -2108,29 +2116,29 @@ msgid "Maximum" msgstr "最大值" -#: ../editors/DataTypeEditor.py:239 +#: ../editors/DataTypeEditor.py:246 msgid "Maximum:" msgstr "最大值：" -#: ../dialogs/BrowseLocationsDialog.py:43 ../editors/Viewer.py:290 -#: ../editors/TextViewer.py:307 ../controls/LocationCellEditor.py:98 -#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351 +#: ../dialogs/BrowseLocationsDialog.py:45 ../editors/Viewer.py:333 +#: ../editors/TextViewer.py:307 ../controls/LocationCellEditor.py:103 +#: ../controls/VariablePanel.py:317 ../controls/VariablePanel.py:380 msgid "Memory" msgstr "存储" -#: ../IDEFrame.py:599 +#: ../IDEFrame.py:617 msgid "Menu ToolBar" msgstr "菜单工具栏" -#: ../dialogs/DurationEditorDialog.py:49 +#: ../dialogs/DurationEditorDialog.py:51 msgid "Microseconds:" msgstr "微秒：" -#: ../editors/Viewer.py:549 +#: ../editors/Viewer.py:585 msgid "Middle" msgstr "中间" -#: ../dialogs/DurationEditorDialog.py:48 +#: ../dialogs/DurationEditorDialog.py:50 msgid "Milliseconds:" msgstr "毫秒：" @@ -2138,78 +2146,82 @@ msgid "Minimum" msgstr "最小值" -#: ../editors/DataTypeEditor.py:226 +#: ../editors/DataTypeEditor.py:233 msgid "Minimum:" msgstr "最小值：" -#: ../dialogs/DurationEditorDialog.py:46 +#: ../dialogs/DurationEditorDialog.py:48 msgid "Minutes:" msgstr "分：" -#: ../controls/ProjectPropertiesPanel.py:211 +#: ../controls/ProjectPropertiesPanel.py:231 msgid "Miscellaneous" msgstr "其他" -#: ../dialogs/LDElementDialog.py:63 +#: ../features.py:32 +msgid "Modbus support" +msgstr "Modbus 支持" + +#: ../dialogs/LDElementDialog.py:65 msgid "Modifier:" msgstr "改动：" -#: ../PLCGenerator.py:786 ../PLCGenerator.py:1230 +#: ../PLCGenerator.py:795 ../PLCGenerator.py:1269 #, python-brace-format msgid "" "More than one connector found corresponding to \"{a1}\" continuation in " "\"{a2}\" POU" msgstr "多个连接器发现对应在 \"{a2}\" POU中 \"{a1}\" 延续" -#: ../dialogs/ActionBlockDialog.py:140 +#: ../dialogs/ActionBlockDialog.py:146 msgid "Move action down" msgstr "下移动作" -#: ../dialogs/ActionBlockDialog.py:139 +#: ../dialogs/ActionBlockDialog.py:145 msgid "Move action up" msgstr "上移动作" -#: ../controls/CustomEditableListBox.py:43 +#: ../controls/CustomEditableListBox.py:46 msgid "Move down" msgstr "下移" -#: ../editors/DataTypeEditor.py:355 +#: ../editors/DataTypeEditor.py:367 msgid "Move element down" msgstr "下移元素" -#: ../editors/DataTypeEditor.py:354 +#: ../editors/DataTypeEditor.py:366 msgid "Move element up" msgstr "上移元素" -#: ../editors/ResourceEditor.py:271 +#: ../editors/ResourceEditor.py:286 msgid "Move instance down" msgstr "下移实例" -#: ../editors/ResourceEditor.py:270 +#: ../editors/ResourceEditor.py:285 msgid "Move instance up" msgstr "上移实例" -#: ../editors/ResourceEditor.py:242 +#: ../editors/ResourceEditor.py:255 msgid "Move task down" msgstr "下移任务" -#: ../editors/ResourceEditor.py:241 +#: ../editors/ResourceEditor.py:254 msgid "Move task up" msgstr "上移任务" -#: ../IDEFrame.py:99 ../IDEFrame.py:114 ../IDEFrame.py:144 ../IDEFrame.py:185 +#: ../IDEFrame.py:106 ../IDEFrame.py:121 ../IDEFrame.py:151 ../IDEFrame.py:192 msgid "Move the view" msgstr "移动视图" -#: ../controls/CustomEditableListBox.py:42 +#: ../controls/CustomEditableListBox.py:45 msgid "Move up" msgstr "上移" -#: ../editors/CodeFileEditor.py:661 ../controls/VariablePanel.py:453 +#: ../editors/CodeFileEditor.py:657 ../controls/VariablePanel.py:484 msgid "Move variable down" msgstr "下移变量" -#: ../editors/CodeFileEditor.py:660 ../controls/VariablePanel.py:452 +#: ../editors/CodeFileEditor.py:656 ../controls/VariablePanel.py:483 msgid "Move variable up" msgstr "上移变量" @@ -2221,26 +2233,26 @@ msgid "Multiplication" msgstr "乘法" -#: ../editors/FileManagementPanel.py:83 +#: ../editors/FileManagementPanel.py:87 msgid "My Computer:" msgstr "我的计算机：" -#: ../dialogs/DiscoveryDialog.py:92 +#: ../dialogs/DiscoveryDialog.py:89 msgid "NAME" msgstr "NAME" -#: ../editors/ResourceEditor.py:68 ../editors/ResourceEditor.py:83 -#: ../editors/DataTypeEditor.py:50 ../editors/CodeFileEditor.py:739 -#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54 +#: ../editors/ResourceEditor.py:76 ../editors/ResourceEditor.py:97 +#: ../editors/DataTypeEditor.py:55 ../editors/CodeFileEditor.py:732 +#: ../controls/VariablePanel.py:59 msgid "Name" msgstr "名字" -#: ../Beremiz_service.py:334 +#: ../Beremiz_service.py:342 msgid "Name must not be null!" msgstr "名称不能为空！" -#: ../dialogs/SFCStepDialog.py:57 ../dialogs/FBDBlockDialog.py:86 -#: ../dialogs/ConnectionDialog.py:76 +#: ../dialogs/SFCStepDialog.py:59 ../dialogs/FBDBlockDialog.py:89 +#: ../dialogs/ConnectionDialog.py:78 msgid "Name:" msgstr "名字：" @@ -2248,46 +2260,46 @@ msgid "Natural logarithm" msgstr "自然对数" -#: ../dialogs/LDElementDialog.py:75 ../editors/Viewer.py:519 +#: ../dialogs/LDElementDialog.py:78 ../editors/Viewer.py:554 msgid "Negated" msgstr "否定" -#: ../Beremiz_service.py:580 +#: ../Beremiz_service.py:610 msgid "Nevow Web service failed. " msgstr "Nevow Web 服务失败。 " -#: ../Beremiz_service.py:556 +#: ../Beremiz_service.py:580 msgid "Nevow/Athena import failed :" msgstr "Nevow/Athena 导入失败：" -#: ../BeremizIDE.py:216 ../BeremizIDE.py:251 ../PLCOpenEditor.py:104 -#: ../PLCOpenEditor.py:146 +#: ../BeremizIDE.py:241 ../BeremizIDE.py:276 ../PLCOpenEditor.py:75 +#: ../PLCOpenEditor.py:117 msgid "New" msgstr "新建" -#: ../controls/CustomEditableListBox.py:40 +#: ../controls/CustomEditableListBox.py:43 msgid "New item" msgstr "新建项目" -#: ../editors/Viewer.py:518 +#: ../editors/Viewer.py:553 msgid "No Modifier" msgstr "无改动" -#: ../ProjectController.py:1826 +#: ../ProjectController.py:1808 msgid "No PLC to transfer (did build succeed ?)\n" msgstr "没有PLC可传输（构建是否成功？）\n" -#: ../PLCGenerator.py:1631 +#: ../PLCGenerator.py:1678 #, python-format msgid "No body defined in \"%s\" POU" msgstr "在 \"%s\" POU 中没有任何东西被定义" -#: ../PLCGenerator.py:806 ../PLCGenerator.py:1241 +#: ../PLCGenerator.py:816 ../PLCGenerator.py:1281 #, python-brace-format msgid "No connector found corresponding to \"{a1}\" continuation in \"{a2}\" POU" msgstr "没有连接器发现对应在 \"{a2}\" POU中 \"{a1}\" 延续" -#: ../PLCOpenEditor.py:357 +#: ../PLCOpenEditor.py:331 msgid "" "No documentation available.\n" "Coming soon." @@ -2295,60 +2307,60 @@ "没有文件可用。\n" "稍候" -#: ../PLCGenerator.py:829 +#: ../PLCGenerator.py:841 #, python-format msgid "No informations found for \"%s\" block" msgstr "对于 \"%s\" 块没有信息发现" -#: ../PLCGenerator.py:1194 +#: ../PLCGenerator.py:1232 #, python-brace-format msgid "" "No output {a1} variable found in block {a2} in POU {a3}. Connection must be " "broken" msgstr "无输出{a1}变量发现在 {a3} POU的 {a2} 块。 连接必须断开" -#: ../controls/SearchResultPanel.py:169 +#: ../controls/SearchResultPanel.py:175 msgid "No search results available." msgstr "没有存在的搜索结果。" -#: ../svgui/svgui.py:134 +#: ../svgui/svgui.py:142 #, python-format msgid "No such SVG file: %s\n" msgstr "没有这样的SVG文件：%s\n" -#: ../canfestival/config_utils.py:639 +#: ../canfestival/config_utils.py:682 #, python-brace-format msgid "No such index/subindex ({a1},{a2}) (variable {a3})" msgstr "没有如此 标签/子标签 ({a1},{a2}) (变量 {a3})" -#: ../canfestival/config_utils.py:362 +#: ../canfestival/config_utils.py:387 #, python-brace-format msgid "No such index/subindex ({a1},{a2}) in ID : {a3} (variable {a4})" msgstr "没有如此 标签/子标签 ({a1},{a2}) 在ID : {a3} (变量 {a4})" -#: ../dialogs/BrowseValuesLibraryDialog.py:83 +#: ../dialogs/BrowseValuesLibraryDialog.py:87 msgid "No valid value selected!" msgstr "没有有效的值被选择！" -#: ../PLCGenerator.py:1629 +#: ../PLCGenerator.py:1676 #, python-format msgid "No variable defined in \"%s\" POU" msgstr "无变量被定义在 \"%s\" POU" -#: ../canfestival/config_utils.py:355 +#: ../canfestival/config_utils.py:379 #, python-brace-format msgid "Non existing node ID : {a1} (variable {a2})" msgstr "不存在节点 ID ：{a1} (variable {a2})" -#: ../controls/VariablePanel.py:64 +#: ../controls/VariablePanel.py:79 msgid "Non-Retain" msgstr "非保持" -#: ../dialogs/LDElementDialog.py:75 +#: ../dialogs/LDElementDialog.py:78 msgid "Normal" msgstr "正常" -#: ../canfestival/config_utils.py:389 +#: ../canfestival/config_utils.py:426 #, python-brace-format msgid "Not PDO mappable variable : '{a1}' (ID:{a2},Idx:{a3},sIdx:{a4}))" msgstr "不是PDO可映射变量：'{a1}' (ID:{a2},Idx:{a3},sIdx:{a4}))" @@ -2357,7 +2369,7 @@ msgid "Not equal to" msgstr "不等于" -#: ../dialogs/SFCDivergenceDialog.py:89 +#: ../dialogs/SFCDivergenceDialog.py:91 msgid "Number of sequences:" msgstr "序列号：" @@ -2365,90 +2377,90 @@ msgid "Numerical" msgstr "数学式" -#: ../editors/CodeFileEditor.py:739 +#: ../editors/CodeFileEditor.py:736 msgid "OnChange" msgstr "在改变中" -#: ../dialogs/SearchInProjectDialog.py:84 +#: ../dialogs/SearchInProjectDialog.py:88 msgid "Only Elements" msgstr "唯一元素" -#: ../BeremizIDE.py:218 ../BeremizIDE.py:252 ../PLCOpenEditor.py:106 -#: ../PLCOpenEditor.py:147 +#: ../BeremizIDE.py:243 ../BeremizIDE.py:277 ../PLCOpenEditor.py:77 +#: ../PLCOpenEditor.py:118 msgid "Open" msgstr "打开" -#: ../svgui/svgui.py:143 +#: ../svgui/svgui.py:151 msgid "Open Inkscape" msgstr "打开 Inkscape" -#: ../version.py:77 +#: ../version.py:86 msgid "" "Open Source framework for automation, implemented IEC 61131 IDE with " "constantly growing set of extensions and flexible PLC runtime." msgstr "开源自动化框架，实现不断增长的扩展集和弹性的PLC运行时的IEC 61131-3 IDE" -#: ../ProjectController.py:1878 +#: ../ProjectController.py:1879 msgid "Open a file explorer to manage project files" msgstr "打开一个文件浏览器来管理项目文件" -#: ../wxglade_hmi/wxglade_hmi.py:155 +#: ../wxglade_hmi/wxglade_hmi.py:161 msgid "Open wxGlade" msgstr "打开 wxGlade" -#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54 +#: ../controls/VariablePanel.py:64 msgid "Option" msgstr "选项" -#: ../dialogs/FindInPouDialog.py:81 ../editors/CodeFileEditor.py:739 +#: ../dialogs/FindInPouDialog.py:84 ../editors/CodeFileEditor.py:737 msgid "Options" msgstr "选项" -#: ../controls/ProjectPropertiesPanel.py:98 +#: ../controls/ProjectPropertiesPanel.py:109 msgid "Organization (optional):" msgstr "组织（选填）：" -#: ../canfestival/SlaveEditor.py:74 ../canfestival/NetworkEditor.py:95 +#: ../canfestival/SlaveEditor.py:78 ../canfestival/NetworkEditor.py:102 msgid "Other Profile" msgstr "其他配置" -#: ../dialogs/SFCStepDialog.py:72 ../dialogs/FBDVariableDialog.py:40 -#: ../dialogs/BrowseLocationsDialog.py:42 ../editors/Viewer.py:290 -#: ../editors/Viewer.py:1628 ../editors/TextViewer.py:307 -#: ../controls/LocationCellEditor.py:98 ../controls/VariablePanel.py:71 -#: ../controls/VariablePanel.py:291 ../controls/VariablePanel.py:351 +#: ../dialogs/SFCStepDialog.py:74 ../dialogs/FBDVariableDialog.py:42 +#: ../dialogs/BrowseLocationsDialog.py:44 ../editors/Viewer.py:333 +#: ../editors/Viewer.py:1661 ../editors/TextViewer.py:307 +#: ../controls/LocationCellEditor.py:103 ../controls/VariablePanel.py:89 +#: ../controls/VariablePanel.py:317 ../controls/VariablePanel.py:380 msgid "Output" msgstr "输出" -#: ../canfestival/SlaveEditor.py:63 ../canfestival/NetworkEditor.py:84 +#: ../canfestival/SlaveEditor.py:67 ../canfestival/NetworkEditor.py:91 msgid "PDO Receive" msgstr "PDO 接收" -#: ../canfestival/SlaveEditor.py:62 ../canfestival/NetworkEditor.py:83 +#: ../canfestival/SlaveEditor.py:66 ../canfestival/NetworkEditor.py:90 msgid "PDO Transmit" msgstr "PDO 传输" -#: ../targets/toolchain_gcc.py:167 +#: ../targets/toolchain_gcc.py:174 msgid "PLC :\n" msgstr "PLC：\n" -#: ../BeremizIDE.py:355 +#: ../BeremizIDE.py:383 msgid "PLC Log" msgstr "PLC 记录" -#: ../ProjectController.py:1054 +#: ../ProjectController.py:1082 msgid "PLC code generation failed !\n" msgstr "PLC 代码生成失败！\n" -#: ../Beremiz_service.py:297 +#: ../Beremiz_service.py:305 msgid "PLC is empty or already started." msgstr "PLC 是空的或者已经被启动。" -#: ../Beremiz_service.py:304 +#: ../Beremiz_service.py:312 msgid "PLC is not started." msgstr "PLC 没有被启动。" -#: ../PLCOpenEditor.py:206 ../PLCOpenEditor.py:319 +#: ../PLCOpenEditor.py:180 ../PLCOpenEditor.py:293 #, python-brace-format msgid "" "PLC syntax error at line {a1}:\n" @@ -2457,15 +2469,15 @@ "PLC语法错误在行 {a1}:\n" "{a2}" -#: ../PLCOpenEditor.py:302 ../PLCOpenEditor.py:383 +#: ../PLCOpenEditor.py:276 ../PLCOpenEditor.py:357 msgid "PLCOpen files (*.xml)|*.xml|All files|*.*" msgstr "PLCOpen 文件 (*.xml)|*.xml|所有文件|*.*" -#: ../PLCOpenEditor.py:154 ../PLCOpenEditor.py:219 +#: ../PLCOpenEditor.py:125 ../PLCOpenEditor.py:193 msgid "PLCOpenEditor" msgstr "PLCOpen编辑器" -#: ../PLCOpenEditor.py:365 +#: ../PLCOpenEditor.py:339 msgid "" "PLCOpenEditor is part of Beremiz project.\n" "\n" @@ -2475,205 +2487,205 @@ "\n" "Beremiz是一个" -#: ../dialogs/DiscoveryDialog.py:95 +#: ../dialogs/DiscoveryDialog.py:92 msgid "PORT" msgstr "端口" -#: ../dialogs/PouDialog.py:101 +#: ../dialogs/PouDialog.py:109 msgid "POU Name" msgstr "POU 名字" -#: ../dialogs/PouDialog.py:58 +#: ../dialogs/PouDialog.py:66 msgid "POU Name:" msgstr "POU 名字：" -#: ../dialogs/PouDialog.py:103 +#: ../dialogs/PouDialog.py:111 msgid "POU Type" msgstr "POU类型" -#: ../dialogs/PouDialog.py:65 +#: ../dialogs/PouDialog.py:73 msgid "POU Type:" msgstr "POU 类型：" -#: ../connectors/PYRO/__init__.py:45 +#: ../connectors/PYRO/__init__.py:52 #, python-format msgid "PYRO connecting to URI : %s\n" msgstr "PYRO 连接到 URI ： %s\n" -#: ../connectors/PYRO/__init__.py:61 +#: ../connectors/PYRO/__init__.py:68 #, python-format msgid "PYRO using certificates in '%s' \n" msgstr "PYRO使用认证在 '%s' \n" -#: ../BeremizIDE.py:231 ../PLCOpenEditor.py:120 +#: ../BeremizIDE.py:256 ../PLCOpenEditor.py:91 msgid "Page Setup" msgstr "页面设置" -#: ../controls/ProjectPropertiesPanel.py:111 +#: ../controls/ProjectPropertiesPanel.py:124 msgid "Page Size (optional):" msgstr "页面大小（选填）：" -#: ../IDEFrame.py:2613 +#: ../IDEFrame.py:2640 #, python-format msgid "Page: %d" msgstr "页：%d" -#: ../controls/PouInstanceVariablesPanel.py:124 +#: ../controls/PouInstanceVariablesPanel.py:134 msgid "Parent instance" msgstr "父实例" -#: ../editors/Viewer.py:657 ../IDEFrame.py:372 ../IDEFrame.py:426 +#: ../editors/Viewer.py:696 ../IDEFrame.py:374 ../IDEFrame.py:428 msgid "Paste" msgstr "粘贴" -#: ../IDEFrame.py:1868 +#: ../IDEFrame.py:1899 msgid "Paste POU" msgstr "粘贴POU" -#: ../dialogs/SearchInProjectDialog.py:56 +#: ../dialogs/SearchInProjectDialog.py:60 msgid "Pattern to search:" msgstr "检索模式：" -#: ../dialogs/LDPowerRailDialog.py:74 +#: ../dialogs/LDPowerRailDialog.py:75 msgid "Pin number:" msgstr "插脚数：" -#: ../editors/Viewer.py:2757 ../editors/Viewer.py:3014 -#: ../editors/SFCViewer.py:770 +#: ../editors/Viewer.py:2792 ../editors/Viewer.py:3060 +#: ../editors/SFCViewer.py:785 msgid "Please choose a target" msgstr "请选择一个目标" -#: ../editors/TextViewer.py:262 +#: ../editors/TextViewer.py:260 msgid "Please enter a block name" msgstr "请输入一个块名称" -#: ../editors/Viewer.py:2627 ../editors/Viewer.py:3056 +#: ../editors/Viewer.py:2661 ../editors/Viewer.py:3103 msgid "Please enter comment text" msgstr "请输入注释文本" -#: ../editors/SFCViewer.py:433 ../editors/SFCViewer.py:455 -#: ../editors/SFCViewer.py:799 +#: ../editors/SFCViewer.py:447 ../editors/SFCViewer.py:469 +#: ../editors/SFCViewer.py:815 msgid "Please enter step name" msgstr "请输入步骤名称" -#: ../Beremiz_service.py:196 +#: ../dialogs/PouNameDialog.py:37 ../Beremiz_service.py:209 msgid "Please enter text" msgstr "请输入文本" -#: ../dialogs/ForceVariableDialog.py:163 +#: ../dialogs/ForceVariableDialog.py:177 #, python-format msgid "Please enter value for a \"%s\" variable:" msgstr "请输入值对于一个 \"%s\" 变量：" -#: ../Beremiz_service.py:319 +#: ../Beremiz_service.py:327 msgid "Port number must be 0 <= port <= 65535!" msgstr "端口号必须为 0 <= 端口号 <= 65535！" -#: ../Beremiz_service.py:319 +#: ../Beremiz_service.py:327 msgid "Port number must be an integer!" msgstr "端口号必须是整数！" -#: ../editors/Viewer.py:595 ../editors/Viewer.py:2416 +#: ../editors/Viewer.py:633 ../editors/Viewer.py:2449 msgid "Power Rail" msgstr "电源导轨" -#: ../dialogs/LDPowerRailDialog.py:51 +#: ../dialogs/LDPowerRailDialog.py:52 msgid "Power Rail Properties" msgstr "电源导轨属性" -#: ../BeremizIDE.py:233 ../PLCOpenEditor.py:122 +#: ../BeremizIDE.py:258 ../PLCOpenEditor.py:93 msgid "Preview" msgstr "打印预览" -#: ../dialogs/BlockPreviewDialog.py:57 +#: ../dialogs/BlockPreviewDialog.py:59 msgid "Preview:" msgstr "预览：" -#: ../BeremizIDE.py:235 ../BeremizIDE.py:255 ../PLCOpenEditor.py:124 -#: ../PLCOpenEditor.py:150 +#: ../BeremizIDE.py:260 ../BeremizIDE.py:280 ../PLCOpenEditor.py:95 +#: ../PLCOpenEditor.py:121 msgid "Print" msgstr "打印" -#: ../IDEFrame.py:1079 +#: ../IDEFrame.py:1110 msgid "Print preview" msgstr "打印预览" -#: ../editors/ResourceEditor.py:68 +#: ../editors/ResourceEditor.py:76 msgid "Priority" msgstr "优先" -#: ../dialogs/SFCTransitionDialog.py:90 +#: ../dialogs/SFCTransitionDialog.py:91 msgid "Priority:" msgstr "优先：" -#: ../runtime/PLCObject.py:369 +#: ../runtime/PLCObject.py:518 #, python-format msgid "Problem starting PLC : error %d" msgstr "故障启动PLC：错误 %d" -#: ../dialogs/ProjectDialog.py:58 +#: ../dialogs/ProjectDialog.py:63 msgid "Product Name" msgstr "产品名称" -#: ../controls/ProjectPropertiesPanel.py:81 +#: ../controls/ProjectPropertiesPanel.py:90 msgid "Product Name (required):" msgstr "产品名字（必填）：" -#: ../controls/ProjectPropertiesPanel.py:83 +#: ../controls/ProjectPropertiesPanel.py:92 msgid "Product Release (optional):" msgstr "产品发布（选填）：" -#: ../dialogs/ProjectDialog.py:59 +#: ../dialogs/ProjectDialog.py:64 msgid "Product Version" msgstr "产品版本" -#: ../controls/ProjectPropertiesPanel.py:82 +#: ../controls/ProjectPropertiesPanel.py:91 msgid "Product Version (required):" msgstr "产品版本（必填）：" -#: ../dialogs/SearchInProjectDialog.py:39 ../IDEFrame.py:1747 -#: ../IDEFrame.py:1944 +#: ../dialogs/SearchInProjectDialog.py:42 ../IDEFrame.py:1778 +#: ../IDEFrame.py:1975 msgid "Program" msgstr "程序" -#: ../PLCOpenEditor.py:347 +#: ../PLCOpenEditor.py:321 msgid "Program was successfully generated!" msgstr "该编程成功生成文件！" -#: ../PLCControler.py:98 +#: ../plcopen/types_enums.py:76 msgid "Programs" msgstr "程序" -#: ../editors/Viewer.py:243 +#: ../editors/Viewer.py:285 msgid "Programs can't be used by other POUs!" msgstr "程序不能被其它POU使用！" -#: ../controls/ProjectPropertiesPanel.py:85 ../IDEFrame.py:584 +#: ../controls/ProjectPropertiesPanel.py:94 ../IDEFrame.py:601 msgid "Project" msgstr "项目" -#: ../controls/SearchResultPanel.py:173 +#: ../controls/SearchResultPanel.py:180 #, python-format msgid "Project '%s':" msgstr "项目 '%s'：" -#: ../ProjectController.py:1877 +#: ../ProjectController.py:1878 msgid "Project Files" msgstr "项目文件" -#: ../dialogs/ProjectDialog.py:57 +#: ../dialogs/ProjectDialog.py:62 msgid "Project Name" msgstr "项目名称" -#: ../controls/ProjectPropertiesPanel.py:79 +#: ../controls/ProjectPropertiesPanel.py:88 msgid "Project Name (required):" msgstr "项目名称（必填）：" -#: ../controls/ProjectPropertiesPanel.py:80 +#: ../controls/ProjectPropertiesPanel.py:89 msgid "Project Version (optional):" msgstr "项目版本（选填）：" -#: ../PLCControler.py:3164 +#: ../PLCControler.py:2717 msgid "" "Project file syntax error:\n" "\n" @@ -2681,90 +2693,90 @@ "项目文件语法错误：\n" "\n" -#: ../dialogs/ProjectDialog.py:33 ../editors/ProjectNodeEditor.py:37 +#: ../dialogs/ProjectDialog.py:36 ../editors/ProjectNodeEditor.py:40 msgid "Project properties" msgstr "项目属性" -#: ../ConfigTreeNode.py:566 +#: ../ConfigTreeNode.py:571 #, python-brace-format msgid "Project tree layout do not match confnode.xml {a1}!={a2} " msgstr "项目树的布局不匹配confnode.xml {a1}!={a2} " -#: ../dialogs/ConnectionDialog.py:98 +#: ../dialogs/ConnectionDialog.py:101 msgid "Propagate Name" msgstr "扩展名" -#: ../PLCControler.py:99 +#: ../plcopen/types_enums.py:77 msgid "Properties" msgstr "属性" -#: ../Beremiz_service.py:442 +#: ../Beremiz_service.py:427 msgid "Publishing service on local network" msgstr "在本地网络上发布服务" -#: ../connectors/PYRO/__init__.py:118 +#: ../connectors/PYRO/__init__.py:126 #, python-format msgid "Pyro exception: %s\n" msgstr "Pyro异常： %s\n" -#: ../Beremiz_service.py:429 -msgid "Pyro object's uri :" -msgstr "Pyro 目标的URL：" - -#: ../Beremiz_service.py:428 +#: ../Beremiz_service.py:420 msgid "Pyro port :" msgstr "Pyro端口：" -#: ../py_ext/PythonEditor.py:81 +#: ../py_ext/PythonEditor.py:84 msgid "Python code" msgstr "Python代码" -#: ../features.py:33 +#: ../features.py:34 msgid "Python file" msgstr "Python文件" -#: ../dialogs/ActionBlockDialog.py:39 +#: ../dialogs/ActionBlockDialog.py:42 msgid "Qualifier" msgstr "合格验证" -#: ../BeremizIDE.py:238 ../PLCOpenEditor.py:130 ../Beremiz_service.py:275 +#: ../BeremizIDE.py:263 ../PLCOpenEditor.py:101 ../Beremiz_service.py:283 msgid "Quit" msgstr "退出" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:225 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:227 msgid "Range:" msgstr "范围：" -#: ../ProjectController.py:1873 +#: ../ProjectController.py:1872 msgid "Raw IEC code" msgstr "原始的IEC代码" -#: ../BeremizIDE.py:1047 +#: ../BeremizIDE.py:1083 #, python-format msgid "Really delete node '%s'?" msgstr "真的删除节点 '%s'吗？" -#: ../IDEFrame.py:362 ../IDEFrame.py:422 +#: ../connectors/WAMP/dialog.py:50 +msgid "Realm:" +msgstr "范围:" + +#: ../IDEFrame.py:367 ../IDEFrame.py:424 msgid "Redo" msgstr "重做" -#: ../dialogs/SFCTransitionDialog.py:75 +#: ../dialogs/SFCTransitionDialog.py:76 msgid "Reference" msgstr "参照" -#: ../dialogs/DiscoveryDialog.py:107 ../IDEFrame.py:432 +#: ../dialogs/DiscoveryDialog.py:109 ../IDEFrame.py:434 msgid "Refresh" msgstr "刷新" -#: ../dialogs/SearchInProjectDialog.py:66 +#: ../dialogs/SearchInProjectDialog.py:70 msgid "Regular expression" msgstr "正则表达式" -#: ../dialogs/FindInPouDialog.py:96 +#: ../dialogs/FindInPouDialog.py:99 msgid "Regular expressions" msgstr "正则表达式" -#: ../editors/Viewer.py:1603 +#: ../editors/Viewer.py:1636 msgid "Release value" msgstr "释放值" @@ -2772,56 +2784,56 @@ msgid "Remainder (modulo)" msgstr "余数（模）" -#: ../BeremizIDE.py:1048 +#: ../BeremizIDE.py:1084 #, python-format msgid "Remove %s node" msgstr "移除 %s 节点" -#: ../IDEFrame.py:2419 +#: ../IDEFrame.py:2445 msgid "Remove Datatype" msgstr "移除数据类型" -#: ../IDEFrame.py:2424 +#: ../IDEFrame.py:2450 msgid "Remove Pou" msgstr "移除POU" -#: ../dialogs/ActionBlockDialog.py:138 +#: ../dialogs/ActionBlockDialog.py:144 msgid "Remove action" msgstr "移除动作" -#: ../editors/DataTypeEditor.py:353 +#: ../editors/DataTypeEditor.py:365 msgid "Remove element" msgstr "移除元素" -#: ../editors/FileManagementPanel.py:63 +#: ../editors/FileManagementPanel.py:66 msgid "Remove file from left folder" msgstr "从左侧目录移除文件" -#: ../editors/ResourceEditor.py:269 +#: ../editors/ResourceEditor.py:284 msgid "Remove instance" msgstr "移除实例" -#: ../canfestival/NetworkEditor.py:104 +#: ../canfestival/NetworkEditor.py:111 msgid "Remove slave" msgstr "移除从站" -#: ../editors/ResourceEditor.py:240 +#: ../editors/ResourceEditor.py:253 msgid "Remove task" msgstr "移除任务" -#: ../editors/CodeFileEditor.py:659 ../controls/VariablePanel.py:451 +#: ../editors/CodeFileEditor.py:655 ../controls/VariablePanel.py:482 msgid "Remove variable" msgstr "移除变量" -#: ../IDEFrame.py:1948 +#: ../IDEFrame.py:1979 msgid "Rename" msgstr "重命名" -#: ../editors/FileManagementPanel.py:181 +#: ../editors/FileManagementPanel.py:187 msgid "Replace File" msgstr "替换文件" -#: ../editors/Viewer.py:561 +#: ../editors/Viewer.py:598 msgid "Replace Wire by connections" msgstr "通过连接替换Wire" @@ -2829,43 +2841,43 @@ msgid "Replacement (within)" msgstr "替换" -#: ../dialogs/LDElementDialog.py:76 +#: ../dialogs/LDElementDialog.py:79 msgid "Reset" msgstr "重置" -#: ../editors/Viewer.py:642 +#: ../editors/Viewer.py:681 msgid "Reset Execution Order" msgstr "重置执行命令" -#: ../IDEFrame.py:451 +#: ../IDEFrame.py:453 msgid "Reset Perspective" msgstr "复位透视图" -#: ../controls/SearchResultPanel.py:105 +#: ../controls/SearchResultPanel.py:103 msgid "Reset search result" msgstr "复位搜索结果" -#: ../BeremizIDE.py:979 ../PLCControler.py:99 +#: ../BeremizIDE.py:1015 ../plcopen/types_enums.py:77 msgid "Resources" msgstr "资源" -#: ../controls/VariablePanel.py:62 +#: ../controls/VariablePanel.py:77 msgid "Retain" msgstr "保持" -#: ../controls/VariablePanel.py:424 +#: ../controls/VariablePanel.py:455 msgid "Return Type:" msgstr "返回类型：" -#: ../editors/Viewer.py:546 +#: ../editors/Viewer.py:582 msgid "Right" msgstr "右" -#: ../dialogs/LDPowerRailDialog.py:64 +#: ../dialogs/LDPowerRailDialog.py:65 msgid "Right PowerRail" msgstr "右电源导轨" -#: ../dialogs/LDElementDialog.py:77 ../editors/Viewer.py:520 +#: ../dialogs/LDElementDialog.py:80 ../editors/Viewer.py:555 msgid "Rising Edge" msgstr "上升沿" @@ -2881,114 +2893,114 @@ msgid "Rounding up/down" msgstr "四舍五入" -#: ../ProjectController.py:1841 +#: ../ProjectController.py:1828 msgid "Run" msgstr "运行" -#: ../ProjectController.py:1099 +#: ../ProjectController.py:1127 msgid "Runtime IO extensions C code generation failed !\n" msgstr "运行时IO扩展C代码生成失败！\n" -#: ../ProjectController.py:1108 +#: ../ProjectController.py:1136 msgid "Runtime library extensions C code generation failed !\n" msgstr "运行时库扩展C代码生成失败！\n" -#: ../canfestival/SlaveEditor.py:61 ../canfestival/NetworkEditor.py:82 +#: ../canfestival/SlaveEditor.py:65 ../canfestival/NetworkEditor.py:89 msgid "SDO Client" msgstr "SDO客户端" -#: ../canfestival/SlaveEditor.py:60 ../canfestival/NetworkEditor.py:81 +#: ../canfestival/SlaveEditor.py:64 ../canfestival/NetworkEditor.py:88 msgid "SDO Server" msgstr "SDO服务器" -#: ../dialogs/PouDialog.py:37 ../controls/ProjectPropertiesPanel.py:144 +#: ../dialogs/PouDialog.py:44 ../controls/ProjectPropertiesPanel.py:158 msgid "SFC" msgstr "顺序功能图" -#: ../PLCGenerator.py:1392 +#: ../PLCGenerator.py:1433 #, python-brace-format msgid "SFC jump in pou \"{a1}\" refers to non-existent SFC step \"{a2}\"" msgstr "POU \"{a1}\" 中的SFC跳转 涉及不存在SFC步 \"{a2}\"" -#: ../PLCGenerator.py:773 +#: ../PLCGenerator.py:780 #, python-format msgid "SFC transition in POU \"%s\" must be connected." msgstr "在POU \"%s\" 中 SFC 移动必须被连接。" -#: ../dialogs/PouTransitionDialog.py:36 ../dialogs/PouActionDialog.py:32 -#: ../dialogs/PouDialog.py:37 +#: ../dialogs/PouTransitionDialog.py:40 ../dialogs/PouActionDialog.py:36 +#: ../dialogs/PouDialog.py:44 msgid "ST" msgstr "结构化文本" -#: ../PLCOpenEditor.py:334 +#: ../PLCOpenEditor.py:308 msgid "ST files (*.st)|*.st|All files|*.*" msgstr "ST 文件 (*.st)|*.st|所有文件|*.*" -#: ../svgui/svgui.py:128 +#: ../svgui/svgui.py:136 msgid "SVG files (*.svg)|*.svg|All files|*.*" msgstr "SVG 文件 (*.svg)|*.svg|All files|*.*" -#: ../features.py:35 +#: ../features.py:36 msgid "SVGUI" msgstr "SVGUI" -#: ../BeremizIDE.py:222 ../BeremizIDE.py:253 ../PLCOpenEditor.py:113 -#: ../PLCOpenEditor.py:148 +#: ../BeremizIDE.py:247 ../BeremizIDE.py:278 ../PLCOpenEditor.py:84 +#: ../PLCOpenEditor.py:119 msgid "Save" msgstr "保存" -#: ../BeremizIDE.py:254 ../PLCOpenEditor.py:115 ../PLCOpenEditor.py:149 +#: ../BeremizIDE.py:279 ../PLCOpenEditor.py:86 ../PLCOpenEditor.py:120 msgid "Save As..." msgstr "另存为..." -#: ../BeremizIDE.py:224 +#: ../BeremizIDE.py:249 msgid "Save as" msgstr "另存为" -#: ../ProjectController.py:511 +#: ../ProjectController.py:530 msgid "Save path is the same as path of a project! \n" msgstr "保存路径和项目路径相同！\n" -#: ../dialogs/SearchInProjectDialog.py:69 +#: ../dialogs/SearchInProjectDialog.py:73 msgid "Scope" msgstr "范围" -#: ../IDEFrame.py:623 +#: ../IDEFrame.py:644 msgid "Search" msgstr "搜索" -#: ../dialogs/SearchInProjectDialog.py:45 ../IDEFrame.py:382 -#: ../IDEFrame.py:428 +#: ../dialogs/SearchInProjectDialog.py:49 ../IDEFrame.py:384 +#: ../IDEFrame.py:430 msgid "Search in Project" msgstr "在项目中搜索" -#: ../dialogs/DurationEditorDialog.py:47 +#: ../dialogs/DurationEditorDialog.py:49 msgid "Seconds:" msgstr "秒：" -#: ../IDEFrame.py:388 +#: ../IDEFrame.py:390 msgid "Select All" msgstr "选择全部" -#: ../editors/Viewer.py:289 ../editors/TextViewer.py:306 -#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:290 -#: ../controls/VariablePanel.py:350 +#: ../editors/Viewer.py:331 ../editors/TextViewer.py:305 +#: ../controls/LocationCellEditor.py:101 ../controls/VariablePanel.py:315 +#: ../controls/VariablePanel.py:378 msgid "Select a variable class:" msgstr "选择一个变量种类：" -#: ../ProjectController.py:1257 +#: ../ProjectController.py:1293 msgid "Select an editor:" msgstr "选择一个编辑：" -#: ../controls/PouInstanceVariablesPanel.py:281 +#: ../controls/PouInstanceVariablesPanel.py:292 msgid "Select an instance" msgstr "选择一个实例" -#: ../IDEFrame.py:607 +#: ../IDEFrame.py:628 msgid "Select an object" msgstr "选择一个对象" -#: ../ProjectController.py:518 +#: ../ProjectController.py:537 msgid "Selected directory already contains another project. Overwrite? \n" msgstr "选择的目录已经包含其他项目。覆盖？\n" @@ -2996,23 +3008,23 @@ msgid "Selection" msgstr "选择" -#: ../dialogs/SFCDivergenceDialog.py:65 +#: ../dialogs/SFCDivergenceDialog.py:66 msgid "Selection Convergence" msgstr "选择收敛" -#: ../dialogs/SFCDivergenceDialog.py:64 +#: ../dialogs/SFCDivergenceDialog.py:65 msgid "Selection Divergence" msgstr "选择发散" -#: ../dialogs/DiscoveryDialog.py:82 +#: ../dialogs/DiscoveryDialog.py:135 msgid "Service Discovery" msgstr "服务探索" -#: ../dialogs/DiscoveryDialog.py:85 +#: ../dialogs/DiscoveryDialog.py:104 msgid "Services available:" msgstr "存在的服务：" -#: ../dialogs/LDElementDialog.py:76 +#: ../dialogs/LDElementDialog.py:79 msgid "Set" msgstr "设置" @@ -3024,27 +3036,27 @@ msgid "Shift right" msgstr "右移" -#: ../ProjectController.py:1867 +#: ../ProjectController.py:1863 msgid "Show IEC code generated by PLCGenerator" msgstr "显示由PLCGenerator生成的IEC代码" -#: ../canfestival/canfestival.py:389 +#: ../canfestival/canfestival.py:407 msgid "Show Master" msgstr "显示主控" -#: ../canfestival/canfestival.py:390 +#: ../canfestival/canfestival.py:408 msgid "Show Master generated by config_utils" msgstr "显示由config_utils生成的主控" -#: ../ProjectController.py:1865 +#: ../ProjectController.py:1862 msgid "Show code" msgstr "显示代码" -#: ../dialogs/SFCDivergenceDialog.py:67 +#: ../dialogs/SFCDivergenceDialog.py:68 msgid "Simultaneous Convergence" msgstr "同步收敛" -#: ../dialogs/SFCDivergenceDialog.py:66 +#: ../dialogs/SFCDivergenceDialog.py:67 msgid "Simultaneous Divergence" msgstr "同步发散" @@ -3052,15 +3064,15 @@ msgid "Sine" msgstr "正弦" -#: ../editors/ResourceEditor.py:68 +#: ../editors/ResourceEditor.py:76 msgid "Single" msgstr "单" -#: ../targets/toolchain_makefile.py:126 +#: ../targets/toolchain_makefile.py:130 msgid "Source didn't change, no build.\n" msgstr "源代码没有变化，不需要构建.\n" -#: ../PLCGenerator.py:397 +#: ../PLCGenerator.py:404 #, python-brace-format msgid "" "Source signal has to be defined for single task '{a1}' in resource " @@ -3071,60 +3083,56 @@ msgid "Square root (base 2)" msgstr "平方根（底数2）" -#: ../plcopen/definitions.py:48 +#: ../plcopen/definitions.py:50 msgid "Standard function blocks" msgstr "标准功能类型" -#: ../ProjectController.py:1843 ../Beremiz_service.py:263 +#: ../ProjectController.py:1829 ../Beremiz_service.py:271 msgid "Start PLC" msgstr "开始PLC" -#: ../ProjectController.py:1046 +#: ../ProjectController.py:1074 #, python-format msgid "Start build in %s\n" msgstr "开始建立 %s\n" -#: ../ProjectController.py:1360 +#: ../ProjectController.py:1397 msgid "Started" msgstr "已开始" -#: ../ProjectController.py:1648 +#: ../ProjectController.py:1633 msgid "Starting PLC\n" msgstr "启动PLC\n" -#: ../BeremizIDE.py:365 +#: ../BeremizIDE.py:393 msgid "Status ToolBar" msgstr "状态工具栏" -#: ../editors/Viewer.py:612 ../editors/Viewer.py:2391 +#: ../editors/Viewer.py:651 ../editors/Viewer.py:2424 msgid "Step" msgstr "步" -#: ../ProjectController.py:1846 +#: ../ProjectController.py:1835 msgid "Stop" msgstr "停止" -#: ../Beremiz_service.py:264 +#: ../Beremiz_service.py:272 msgid "Stop PLC" msgstr "停止PLC" -#: ../ProjectController.py:1848 +#: ../ProjectController.py:1836 msgid "Stop Running PLC" msgstr "停止运行PLC" -#: ../ProjectController.py:1361 +#: ../ProjectController.py:1398 msgid "Stopped" msgstr "已停止" -#: ../ProjectController.py:1620 -msgid "Stopping debugger...\n" -msgstr "停止调试器...\n" - -#: ../editors/DataTypeEditor.py:54 +#: ../editors/DataTypeEditor.py:60 msgid "Structure" msgstr "结构的" -#: ../editors/DataTypeEditor.py:54 +#: ../editors/DataTypeEditor.py:60 msgid "Subrange" msgstr "子集的" @@ -3132,19 +3140,19 @@ msgid "Subtraction" msgstr "减法" -#: ../ProjectController.py:1085 +#: ../ProjectController.py:1113 msgid "Successfully built.\n" msgstr "成功构建.\n" -#: ../IDEFrame.py:447 +#: ../IDEFrame.py:449 msgid "Switch perspective" msgstr "切换视图" -#: ../dialogs/SearchInProjectDialog.py:165 ../dialogs/FindInPouDialog.py:115 +#: ../dialogs/SearchInProjectDialog.py:169 ../dialogs/FindInPouDialog.py:118 msgid "Syntax error in regular expression of pattern to search!" msgstr "在模式搜索正则表达式语法错误！" -#: ../dialogs/DiscoveryDialog.py:93 +#: ../dialogs/DiscoveryDialog.py:90 msgid "TYPE" msgstr "类型" @@ -3152,19 +3160,19 @@ msgid "Tangent" msgstr "正切" -#: ../editors/ResourceEditor.py:83 +#: ../editors/ResourceEditor.py:97 msgid "Task" msgstr "任务 " -#: ../editors/ResourceEditor.py:235 +#: ../editors/ResourceEditor.py:248 msgid "Tasks:" msgstr "任务：" -#: ../controls/VariablePanel.py:73 +#: ../controls/VariablePanel.py:91 msgid "Temp" msgstr "缓冲" -#: ../version.py:30 +#: ../version.py:35 msgid "" "The best place to ask questions about Beremiz/PLCOpenEditor\n" "is project's mailing list: beremiz-devel@lists.sourceforge.net\n" @@ -3184,7 +3192,7 @@ "你可在这里订阅列表：\n" "https://lists.sourceforge.net/lists/listinfo/beremiz-devel" -#: ../editors/FileManagementPanel.py:180 +#: ../editors/FileManagementPanel.py:186 #, python-format msgid "" "The file '%s' already exist.\n" @@ -3193,22 +3201,22 @@ "文件 '%s' 已经存在。\n" "你真的要替换它？" -#: ../editors/LDViewer.py:882 +#: ../editors/LDViewer.py:893 msgid "The group of block must be coherent!" msgstr "块的组必须是连贯的！" -#: ../BeremizIDE.py:542 ../IDEFrame.py:1015 +#: ../BeremizIDE.py:573 ../IDEFrame.py:1046 msgid "There are changes, do you want to save?" msgstr "文件已被改动。你希望保存吗？" -#: ../IDEFrame.py:1658 ../IDEFrame.py:1677 +#: ../IDEFrame.py:1691 ../IDEFrame.py:1710 #, python-format msgid "" "There is a POU named \"%s\". This could cause a conflict. Do you wish to " "continue?" msgstr "一个编程组织单元被命名为\"%s\"。这可能会产生冲突。你希望继续吗？" -#: ../IDEFrame.py:1102 +#: ../IDEFrame.py:1133 msgid "" "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" @@ -3216,11 +3224,11 @@ "打印出现问题。\n" "请检查你当前打印机设置。" -#: ../editors/LDViewer.py:891 +#: ../editors/LDViewer.py:902 msgid "This option isn't available yet!" msgstr "该选项尚未可用！" -#: ../controls/DebugVariablePanel/DebugVariablePanel.py:565 +#: ../controls/DebugVariablePanel/DebugVariablePanel.py:567 #, python-format msgid "Tick: %d" msgstr "滴答： %d" @@ -3258,94 +3266,94 @@ msgid "Time-of-day subtraction" msgstr "日期时间减法" -#: ../dialogs/ForceVariableDialog.py:172 +#: ../dialogs/ForceVariableDialog.py:188 msgid "Toggle value" msgstr "触发值" -#: ../editors/Viewer.py:548 +#: ../editors/Viewer.py:584 msgid "Top" msgstr "顶部" -#: ../ProjectController.py:1855 +#: ../ProjectController.py:1848 msgid "Transfer" msgstr "传输" -#: ../ProjectController.py:1857 +#: ../ProjectController.py:1849 msgid "Transfer PLC" msgstr "传输PLC" -#: ../ProjectController.py:1820 +#: ../ProjectController.py:1802 msgid "Transfer completed successfully.\n" msgstr "传输成功\n" -#: ../ProjectController.py:1823 +#: ../ProjectController.py:1805 msgid "Transfer failed\n" msgstr "传输失败\n" -#: ../editors/Viewer.py:613 ../editors/Viewer.py:2393 -#: ../editors/Viewer.py:2420 +#: ../editors/Viewer.py:652 ../editors/Viewer.py:2426 +#: ../editors/Viewer.py:2453 msgid "Transition" msgstr "转换" -#: ../PLCGenerator.py:1518 +#: ../PLCGenerator.py:1564 #, python-format msgid "" "Transition \"%s\" body must contain an output variable or coil referring to " "its name" msgstr "转换 \"%s\" 体必须包含一个输出变量或圈指的是它的名字" -#: ../dialogs/PouTransitionDialog.py:84 +#: ../dialogs/PouTransitionDialog.py:91 msgid "Transition Name" msgstr "转换名字" -#: ../dialogs/PouTransitionDialog.py:53 +#: ../dialogs/PouTransitionDialog.py:60 msgid "Transition Name:" msgstr "转换名字：" -#: ../PLCGenerator.py:1609 +#: ../PLCGenerator.py:1657 #, python-brace-format msgid "Transition with content \"{a1}\" not connected to a next step in \"{a2}\" POU" msgstr "转换的内容 \"{a1}\" 没有连接到下一步在 \"{a2}\" POU" -#: ../PLCGenerator.py:1598 +#: ../PLCGenerator.py:1646 #, python-brace-format msgid "" "Transition with content \"{a1}\" not connected to a previous step in " "\"{a2}\" POU" msgstr "转换的内容 \"{a1}\" 没有连接到前一步在 \"{a2}\" POU" -#: ../plcopen/plcopen.py:1323 +#: ../plcopen/plcopen.py:1526 #, python-format msgid "Transition with name %s doesn't exist!" msgstr "已命名的转换 %s 尚不存在！" -#: ../PLCControler.py:98 +#: ../plcopen/types_enums.py:76 msgid "Transitions" msgstr "转换" -#: ../dialogs/AboutDialog.py:131 +#: ../dialogs/AboutDialog.py:127 msgid "Translated by" msgstr "转换因为" -#: ../editors/ResourceEditor.py:68 +#: ../editors/ResourceEditor.py:76 msgid "Triggering" msgstr "触发" -#: ../Beremiz_service.py:478 +#: ../Beremiz_service.py:490 msgid "Twisted unavailable." msgstr "扭曲的不可用。" -#: ../dialogs/ActionBlockDialog.py:39 ../editors/ResourceEditor.py:83 -#: ../editors/DataTypeEditor.py:50 ../editors/CodeFileEditor.py:739 -#: ../controls/VariablePanel.py:53 ../controls/VariablePanel.py:54 +#: ../dialogs/ActionBlockDialog.py:42 ../editors/ResourceEditor.py:97 +#: ../editors/DataTypeEditor.py:55 ../editors/CodeFileEditor.py:733 +#: ../controls/VariablePanel.py:61 msgid "Type" msgstr "类型" -#: ../dialogs/BrowseLocationsDialog.py:49 +#: ../dialogs/BrowseLocationsDialog.py:54 msgid "Type and derivated" msgstr "类型和派生" -#: ../canfestival/config_utils.py:336 ../canfestival/config_utils.py:624 +#: ../canfestival/config_utils.py:359 ../canfestival/config_utils.py:666 #, python-format msgid "Type conflict for location \"%s\"" msgstr "位置的冲突类型 \"%s\"" @@ -3354,179 +3362,233 @@ msgid "Type conversion" msgstr "类型转换" -#: ../editors/DataTypeEditor.py:162 +#: ../editors/DataTypeEditor.py:170 msgid "Type infos:" msgstr "类型信息：" -#: ../dialogs/BrowseLocationsDialog.py:50 +#: ../dialogs/BrowseLocationsDialog.py:55 msgid "Type strict" msgstr "严格类型" -#: ../dialogs/SFCDivergenceDialog.py:59 ../dialogs/SFCTransitionDialog.py:58 -#: ../dialogs/LDPowerRailDialog.py:57 ../dialogs/BrowseLocationsDialog.py:100 -#: ../dialogs/FBDBlockDialog.py:66 ../dialogs/ConnectionDialog.py:59 +#: ../dialogs/SFCDivergenceDialog.py:60 ../dialogs/SFCTransitionDialog.py:59 +#: ../dialogs/LDPowerRailDialog.py:58 ../dialogs/BrowseLocationsDialog.py:111 +#: ../dialogs/FBDBlockDialog.py:69 ../dialogs/ConnectionDialog.py:61 msgid "Type:" msgstr "类型：" -#: ../canfestival/config_utils.py:462 ../canfestival/config_utils.py:476 +#: ../connectors/PYRO/dialog.py:39 ../connectors/WAMP/dialog.py:42 +msgid "URI host:" +msgstr "URI主机:" + +#: ../connectors/PYRO/dialog.py:43 ../connectors/WAMP/dialog.py:46 +msgid "URI port:" +msgstr "URI端口:" + +#: ../controls/UriLocationEditor.py:35 +msgid "URI type:" +msgstr "URI 类型:" + +#: ../canfestival/config_utils.py:500 ../canfestival/config_utils.py:515 #, python-format msgid "Unable to define PDO mapping for node %02x" msgstr "对于 %02x节点不能定义POU映射" -#: ../targets/Xenomai/__init__.py:39 +#: ../targets/Xenomai/__init__.py:43 #, python-format msgid "Unable to get Xenomai's %s \n" msgstr "不能获得 Xenomai 的 %s \n" -#: ../PLCGenerator.py:961 ../PLCGenerator.py:1214 +#: ../PLCGenerator.py:974 ../PLCGenerator.py:1252 #, python-brace-format msgid "Undefined block type \"{a1}\" in \"{a2}\" POU" msgstr "未定义块类型 \"{a1}\" 在 \"{a2}\" POU中" -#: ../PLCGenerator.py:254 +#: ../PLCGenerator.py:261 #, python-format msgid "Undefined pou type \"%s\"" msgstr "未定义的pou类型" -#: ../IDEFrame.py:360 ../IDEFrame.py:421 +#: ../IDEFrame.py:365 ../IDEFrame.py:423 msgid "Undo" msgstr "撤销" -#: ../ProjectController.py:423 +#: ../ProjectController.py:442 msgid "Unknown" msgstr "未知" -#: ../editors/Viewer.py:394 +#: ../editors/Viewer.py:437 #, python-format msgid "Unknown variable \"%s\" for this POU!" msgstr "未知的变量 \"%s\" 这个POU！" -#: ../ProjectController.py:420 ../ProjectController.py:421 +#: ../ProjectController.py:439 ../ProjectController.py:440 msgid "Unnamed" msgstr "未命名" -#: ../PLCControler.py:638 +#: ../PLCControler.py:263 #, python-format msgid "Unnamed%d" msgstr "未命名%d" -#: ../controls/VariablePanel.py:284 +#: ../controls/VariablePanel.py:308 #, python-format msgid "Unrecognized data size \"%s\"" msgstr "无法识别数据大小 \"%s\"" -#: ../editors/DataTypeEditor.py:630 ../controls/VariablePanel.py:827 +#: ../editors/DataTypeEditor.py:646 ../controls/VariablePanel.py:841 msgid "User Data Types" msgstr "用户数据类型" -#: ../canfestival/SlaveEditor.py:65 ../canfestival/NetworkEditor.py:86 +#: ../canfestival/SlaveEditor.py:69 ../canfestival/NetworkEditor.py:93 msgid "User Type" msgstr "用户类型" -#: ../PLCControler.py:97 +#: ../plcopen/types_enums.py:75 msgid "User-defined POUs" msgstr "用户 - 定义POUs" -#: ../dialogs/ActionBlockDialog.py:39 +#: ../dialogs/ActionBlockDialog.py:42 msgid "Value" msgstr "值" -#: ../editors/DataTypeEditor.py:259 +#: ../editors/DataTypeEditor.py:267 msgid "Values:" msgstr "值：" -#: ../dialogs/ActionBlockDialog.py:43 ../editors/Viewer.py:585 -#: ../editors/Viewer.py:2423 +#: ../dialogs/ActionBlockDialog.py:47 ../editors/Viewer.py:622 +#: ../editors/Viewer.py:2456 msgid "Variable" msgstr "变量" -#: ../editors/Viewer.py:309 ../editors/Viewer.py:339 ../editors/Viewer.py:361 -#: ../editors/TextViewer.py:292 ../editors/TextViewer.py:343 -#: ../editors/TextViewer.py:366 ../controls/VariablePanel.py:329 +#: ../editors/Viewer.py:352 ../editors/Viewer.py:382 ../editors/Viewer.py:404 +#: ../editors/TextViewer.py:290 ../editors/TextViewer.py:344 +#: ../editors/TextViewer.py:367 ../controls/VariablePanel.py:355 msgid "Variable Drop" msgstr "变量Drop" -#: ../dialogs/FBDVariableDialog.py:64 +#: ../dialogs/FBDVariableDialog.py:68 msgid "Variable Properties" msgstr "变量属性" -#: ../editors/Viewer.py:289 ../editors/TextViewer.py:306 -#: ../controls/LocationCellEditor.py:97 ../controls/VariablePanel.py:290 -#: ../controls/VariablePanel.py:350 +#: ../editors/Viewer.py:332 ../editors/TextViewer.py:306 +#: ../controls/LocationCellEditor.py:102 ../controls/VariablePanel.py:316 +#: ../controls/VariablePanel.py:379 msgid "Variable class" msgstr "变量种类" -#: ../editors/Viewer.py:396 ../editors/TextViewer.py:387 +#: ../editors/Viewer.py:439 ../editors/TextViewer.py:388 msgid "Variable don't belong to this POU!" msgstr "变量不属于这个POU！" -#: ../dialogs/LDElementDialog.py:89 +#: ../dialogs/LDElementDialog.py:92 msgid "Variable:" msgstr "变量：" -#: ../controls/VariablePanel.py:72 +#: ../controls/VariablePanel.py:90 msgid "Variables" msgstr "变量" -#: ../controls/ProjectPropertiesPanel.py:152 +#: ../controls/ProjectPropertiesPanel.py:166 msgid "Vertical:" msgstr "垂直的：" -#: ../Beremiz_service.py:588 +#: ../runtime/WampClient.py:113 +#, python-format +msgid "WAMP Client connection failed (%s) .. retrying .." +msgstr "WAMP 客户端连接失败 (%s) .. 重试 .." + +#: ../runtime/WampClient.py:117 +#, python-format +msgid "WAMP Client connection lost (%s) .. retrying .." +msgstr "WAMP 客户端连接丢失 (%s) .. 重试 .." + +#: ../connectors/WAMP/dialog.py:54 +msgid "WAMP ID:" +msgstr "WAMP ID:" + +#: ../runtime/WampClient.py:172 +msgid "WAMP client connecting to :" +msgstr "WAMP 客户端连接到 :" + +#: ../runtime/WampClient.py:148 +msgid "WAMP client connection not established!" +msgstr "WAMP 客户端连接没有建立!" + +#: ../Beremiz_service.py:625 msgid "WAMP client startup failed. " msgstr "WAMP客户端启动失败。" -#: ../connectors/WAMP/__init__.py:91 +#: ../Beremiz_service.py:621 +msgid "WAMP config is incomplete." +msgstr "WAMP 配置不完整." + +#: ../Beremiz_service.py:623 +msgid "WAMP config is missing." +msgstr "WAMP 配置丢失." + +#: ../connectors/WAMP/__init__.py:99 #, python-format msgid "WAMP connecting to URL : %s\n" msgstr "WAMP 连接到 URL : %s\n" -#: ../connectors/WAMP/__init__.py:131 +#: ../connectors/WAMP/__init__.py:140 msgid "WAMP connection timeout" msgstr "WAMP连接超时" -#: ../connectors/WAMP/__init__.py:150 +#: ../connectors/WAMP/__init__.py:158 #, python-format msgid "WAMP connection to '%s' failed.\n" msgstr "WAMP 连接到 '%s' 失败。\n" -#: ../Beremiz_service.py:564 +#: ../Beremiz_service.py:595 msgid "WAMP import failed :" msgstr "WAMP导入失败：" -#: ../wxglade_hmi/wxglade_hmi.py:37 +#: ../runtime/WampClient.py:126 +msgid "WAMP load error: " +msgstr "WAMP 加载错误: " + +#: ../runtime/WampClient.py:108 +msgid "WAMP session left" +msgstr "WAMP 会话残留" + +#: ../wxglade_hmi/wxglade_hmi.py:44 msgid "WXGLADE GUI" msgstr "WXGLADE 用户图形界面" -#: ../dialogs/PouDialog.py:129 ../editors/LDViewer.py:891 +#: ../runtime/WampClient.py:137 +msgid "Wamp secret load error:" +msgstr "Wamp 加密加载错误:" + +#: ../dialogs/PouDialog.py:137 ../editors/LDViewer.py:902 msgid "Warning" msgstr "警告" -#: ../ProjectController.py:707 +#: ../ProjectController.py:726 msgid "Warnings in ST/IL/SFC code generator :\n" msgstr "警告在ST/IL/SFC代码生成器中：\n" -#: ../dialogs/SearchInProjectDialog.py:78 +#: ../dialogs/SearchInProjectDialog.py:82 msgid "Whole Project" msgstr "整个项目" -#: ../controls/ProjectPropertiesPanel.py:120 +#: ../controls/ProjectPropertiesPanel.py:134 msgid "Width:" msgstr "宽度：" -#: ../dialogs/FindInPouDialog.py:91 +#: ../dialogs/FindInPouDialog.py:94 msgid "Wrap search" msgstr "包搜索" -#: ../dialogs/AboutDialog.py:130 +#: ../dialogs/AboutDialog.py:126 msgid "Written by" msgstr "出自" -#: ../features.py:34 +#: ../features.py:35 msgid "WxGlade GUI" msgstr "WxGlade GUI" -#: ../svgui/svgui.py:142 +#: ../svgui/svgui.py:150 msgid "" "You don't have write permissions.\n" "Open Inkscape anyway ?" @@ -3534,7 +3596,7 @@ "你没有写入的许可。\n" "无论如何都打开Inkscape？" -#: ../wxglade_hmi/wxglade_hmi.py:154 +#: ../wxglade_hmi/wxglade_hmi.py:160 msgid "" "You don't have write permissions.\n" "Open wxGlade anyway ?" @@ -3542,7 +3604,7 @@ "你没有写入的许可。\n" "无论如何都打开wxGlade？" -#: ../ProjectController.py:371 +#: ../ProjectController.py:390 msgid "" "You must have permission to work on the project\n" "Work on a project copy ?" @@ -3550,79 +3612,71 @@ "你必须有在此项目上工作的许可\n" "在项目的一个拷贝上工作？" -#: ../editors/LDViewer.py:886 +#: ../editors/LDViewer.py:897 msgid "" "You must select the block or group of blocks around which a branch should be" " added!" msgstr "你必须选择一个块或块的组围绕着需被添加的分支！" -#: ../editors/LDViewer.py:666 +#: ../editors/LDViewer.py:677 msgid "You must select the wire where a contact should be added!" msgstr "你必须选择一条线连接需被添加的接触点！" -#: ../dialogs/SFCStepNameDialog.py:48 ../dialogs/PouNameDialog.py:46 +#: ../dialogs/SFCStepNameDialog.py:52 ../dialogs/PouNameDialog.py:50 msgid "You must type a name!" msgstr "你必须输入一个名字！" -#: ../dialogs/ForceVariableDialog.py:193 +#: ../dialogs/ForceVariableDialog.py:209 msgid "You must type a value!" msgstr "你必须输入一个值！" -#: ../IDEFrame.py:438 +#: ../IDEFrame.py:440 msgid "Zoom" msgstr "显示比例" -#: ../dialogs/DurationEditorDialog.py:155 +#: ../dialogs/DurationEditorDialog.py:158 msgid "days" msgstr "日" -#: ../PLCOpenEditor.py:343 +#: ../PLCOpenEditor.py:317 #, python-format msgid "error: %s\n" msgstr "错误：%s\n" -#: ../util/ProcessLogger.py:169 +#: ../util/ProcessLogger.py:178 #, python-brace-format msgid "exited with status {a1} (pid {a2})\n" msgstr "退出伴随状态 {a1} (pid {a2})\n" -#: ../PLCOpenEditor.py:406 ../PLCOpenEditor.py:408 -msgid "file : " -msgstr "文件：" - -#: ../dialogs/PouDialog.py:32 +#: ../dialogs/PouDialog.py:36 msgid "function" msgstr "功能" -#: ../PLCOpenEditor.py:409 -msgid "function : " -msgstr "功能：" - -#: ../dialogs/PouDialog.py:32 +#: ../dialogs/PouDialog.py:36 msgid "functionBlock" msgstr "功能块" -#: ../dialogs/DurationEditorDialog.py:155 +#: ../dialogs/DurationEditorDialog.py:158 msgid "hours" msgstr "小时" -#: ../PLCOpenEditor.py:409 -msgid "line : " -msgstr "在线：" - -#: ../dialogs/DurationEditorDialog.py:157 +#: ../ProjectController.py:753 +msgid "matiec installation is not found\n" +msgstr "matiec安装没有发现\n" + +#: ../dialogs/DurationEditorDialog.py:160 msgid "milliseconds" msgstr "毫秒" -#: ../dialogs/DurationEditorDialog.py:156 +#: ../dialogs/DurationEditorDialog.py:159 msgid "minutes" msgstr "分" -#: ../dialogs/PouDialog.py:32 +#: ../dialogs/PouDialog.py:36 msgid "program" msgstr "程序" -#: ../dialogs/DurationEditorDialog.py:156 +#: ../dialogs/DurationEditorDialog.py:159 msgid "seconds" msgstr "秒" @@ -3638,27 +3692,27 @@ msgid "string right of" msgstr "从右取字符串" -#: ../Beremiz.py:164 +#: ../Beremiz.py:167 msgid "update info unavailable." msgstr "更新信息不存在" -#: ../PLCOpenEditor.py:341 +#: ../PLCOpenEditor.py:315 #, python-format msgid "warning: %s\n" msgstr "警告：%s\n" -#: ../PLCControler.py:972 +#: ../PLCControler.py:576 #, python-brace-format msgid "{a1} \"{a2}\" can't be pasted as a {a3}." msgstr "{a1} \"{a2}\" 不能被粘贴作为一个 {a3}." -#: ../ConfigTreeNode.py:56 +#: ../ConfigTreeNode.py:58 #, python-brace-format msgid "" -"{a1} XML file doesn't follow XSD schema at line %{a2}:\n" +"{a1} XML file doesn't follow XSD schema at line {a2}:\n" "{a3}" msgstr "" -"{a1} XML文件没有遵循XSD schema在行 %{a2}:\n" +"{a1} XML文件没有遵循XSD schema在行 {a2}:\n" "{a3}" #: Extra XSD strings @@ -3722,6 +3776,72 @@ msgid "Win32" msgstr "Win32" +msgid "ModbusRequest" +msgstr "Modbus请求" + +msgid "SlaveID" +msgstr "从站ID" + +msgid "Nr_of_Channels" +msgstr "通道号" + +msgid "Start_Address" +msgstr "起始地址" + +msgid "Timeout_in_ms" +msgstr "超时 ms单位" + +msgid "MemoryArea" +msgstr "存储区域" + +msgid "MemoryAreaType" +msgstr "存储区域类型" + +msgid "ModbusTCPclient" +msgstr "ModubsTCP客户端" + +msgid "Remote_IP_Address" +msgstr "远程IP地址" + +msgid "Remote_Port_Number" +msgstr "远程端口号" + +msgid "Invocation_Rate_in_ms" +msgstr "调用率ms单位" + +msgid "ModbusServerNode" +msgstr "Modbus服务器节点" + +msgid "Local_IP_Address" +msgstr "本地IP地址" + +msgid "Local_Port_Number" +msgstr "本地端口号" + +msgid "ModbusRTUclient" +msgstr "ModbusRTC客户端" + +msgid "Serial_Port" +msgstr "串行端口" + +msgid "Baud_Rate" +msgstr "波特率" + +msgid "Parity" +msgstr "奇偶校验" + +msgid "Stop_Bits" +msgstr "停止位" + +msgid "ModbusRTUslave" +msgstr "ModbusRTU从站" + +msgid "ModbusRoot" +msgstr "Modbus根" + +msgid "MaxRemoteTCPclients" +msgstr "最大远程TCP客户端" + msgid "BaseParams" msgstr "基本参照 " @@ -3896,7 +4016,7 @@ msgid "" "The semaphore provides a mechanism to allow software elements mutually " -"exclusive access to certain ressources." +"exclusive access to certain resources." msgstr "信号量提供一种机制，允许软件元素互斥排他的访问某一资源。" msgid "The output produces a single pulse when a rising edge is detected."