Skip to content

Commit f5a21e0

Browse files
2mik2mik
authored
Merge pull request #57 from RapidScada/develop
Merge Develop to Master
2 parents 15c22ac + 611bde3 commit f5a21e0

File tree

1,002 files changed

+67171
-7716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,002 files changed

+67171
-7716
lines changed

‎LangPack/Chinese-Simplified/ScadaAdmin/Lang/DrvCnlBasic.zh-Hans.xml

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
<Phrase key="pbReconnectAfterHint.ToolTip">指定连接失败后，重新连接的间隔时间。</Phrase>
4444
<Phrase key="lblStayConnected">保持连接</Phrase>
4545
<Phrase key="pbStayConnectedHint.ToolTip">如果设置此项，在会话结束后将保持连接。&#13;&#10;否则连接将在每次会话后断开。</Phrase>
46+
<Phrase key="lblDisconnectOnError">错误断开连接</Phrase>
47+
<Phrase key="pbDisconnectOnError.ToolTip">指示是否在会话失败时断开连接。</Phrase>
4648
<Phrase key="btnOK">确定</Phrase>
4749
<Phrase key="btnCancel">取消</Phrase>
4850
<Phrase key="HostRequired">远程服务器是必需的。</Phrase>

‎LangPack/Chinese-Simplified/ScadaAdmin/Lang/DrvModbusSlave.zh-Hans.xml

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DrvModbusSlaveDictionaries>
3+
<Dictionary key="Scada.Comm.Drivers.DrvModbusSlave.View.Controls">
4+
<Phrase key="ConfigDirRequired">设备模板文件必须位于 {0} 内</Phrase>
5+
</Dictionary>
6+
<Dictionary key="Scada.Comm.Drivers.DrvModbusSlave.View.Controls.CtrlChannelGateway">
7+
<Phrase key="gbChannelGateway">通道网关选项</Phrase>
8+
<Phrase key="btnEdit">编辑</Phrase>
9+
</Dictionary>
10+
<Dictionary key="Scada.Comm.Drivers.DrvModbusSlave.View.Controls.CtrlDeviceGateway">
11+
<Phrase key="gbDeviceGateway">设备网关选项</Phrase>
12+
<Phrase key="lblTemplateFileName">设备模板</Phrase>
13+
<Phrase key="btnEditTemplate">编辑</Phrase>
14+
<Phrase key="btnBrowseTemplate">浏览...</Phrase>
15+
<Phrase key="lblSourceDeviceNum">数据源设备</Phrase>
16+
<Phrase key="btnSelect">选择</Phrase>
17+
</Dictionary>
18+
<Dictionary key="Scada.Comm.Drivers.DrvModbusSlave.View.Controls.CtrlElem">
19+
<Phrase key="gbElem">元素参数</Phrase>
20+
<Phrase key="lblChannel">渠道</Phrase>
21+
<Phrase key="lblAddress">地址</Phrase>
22+
<Phrase key="lblAddressHint">十月，从0开始</Phrase>
23+
<Phrase key="lblDataType">数据类型</Phrase>
24+
<Phrase key="cbType.Items[0]">不明确的</Phrase>
25+
<Phrase key="cbType.Items[1]">ushort (2 bytes)</Phrase>
26+
<Phrase key="cbType.Items[2]">short (2 bytes)</Phrase>
27+
<Phrase key="cbType.Items[3]">uint (4 bytes)</Phrase>
28+
<Phrase key="cbType.Items[4]">int (4 bytes)</Phrase>
29+
<Phrase key="cbType.Items[5]">ulong (8 bytes)</Phrase>
30+
<Phrase key="cbType.Items[6]">long (8 bytes)</Phrase>
31+
<Phrase key="cbType.Items[7]">float (4 bytes)</Phrase>
32+
<Phrase key="cbType.Items[8]">double (8 bytes)</Phrase>
33+
<Phrase key="cbType.Items[9]">bool (1 bit)</Phrase>
34+
<Phrase key="lblRatio">比率</Phrase>
35+
<Phrase key="chkReadOnly">只读</Phrase>
36+
<Phrase key="ChannelNotSpecified">未指定频道</Phrase>
37+
</Dictionary>
38+
<Dictionary key="Scada.Comm.Drivers.DrvModbusSlave.View.Controls.CtrlIndependentDevice">
39+
<Phrase key="gbIndependentDevice">独立的设备选项</Phrase>
40+
<Phrase key="lblTemplateFileName">设备模板</Phrase>
41+
<Phrase key="btnEditTemplate">编辑</Phrase>
42+
<Phrase key="btnBrowseTemplate">浏览...</Phrase>
43+
<Phrase key="lblDataLifetime">数据有效期，分钟</Phrase>
44+
</Dictionary>
45+
<Dictionary key="Scada.Comm.Drivers.DrvModbusSlave.View.Forms.FrmChannelGatewayOptions">
46+
<Phrase key="this">通道网关选项</Phrase>
47+
<Phrase key="btnAdd">添加频道</Phrase>
48+
<Phrase key="btnMoveUp.ToolTip">提升</Phrase>
49+
<Phrase key="btnMoveDown.ToolTip">下移</Phrase>
50+
<Phrase key="btnDelete.ToolTip">删除</Phrase>
51+
<Phrase key="btnOK">好的</Phrase>
52+
<Phrase key="btnCancel">取消</Phrase>
53+
<Phrase key="miCollapseAll">全部收缩</Phrase>
54+
<Phrase key="gbChannelGateway">频道</Phrase>
55+
<Phrase key="SelectChildNode">选择子节点</Phrase>
56+
<Phrase key="ChannelItem">频道{0}</Phrase>
57+
<Phrase key="DiscreteInputs">离散输入</Phrase>
58+
<Phrase key="Coils">线圈</Phrase>
59+
<Phrase key="InputRegisters">输入寄存器</Phrase>
60+
<Phrase key="HoldingRegisters">持有寄存器</Phrase>
61+
</Dictionary>
62+
<Dictionary key="Scada.Comm.Drivers.DrvModbusSlave.View.Forms.FrmDeviceConfig">
63+
<Phrase key="this">设备 {0} 属性 - Modbus Slave</Phrase>
64+
<Phrase key="gbGeneralOptions">常规选项</Phrase>
65+
<Phrase key="lblMode">模式</Phrase>
66+
<Phrase key="cbDevicesMode.Items[0]">独立装置</Phrase>
67+
<Phrase key="cbDevicesMode.Items[1]">设备网关</Phrase>
68+
<Phrase key="cbDevicesMode.Items[2]">通道网关</Phrase>
69+
<Phrase key="lblUndefinedValue">未定义的值</Phrase>
70+
<Phrase key="btnSave">节省</Phrase>
71+
<Phrase key="btnClose">关闭</Phrase>
72+
<Phrase key="IndependentDeviceDescription">从 Modbus Master 接收数据。</Phrase>
73+
<Phrase key="DeviceGatewayDescription">将所选设备的数据提供给 Modbus Master。</Phrase>
74+
<Phrase key="ChannelGatewayDescription">将所选通道的数据提供给 Modbus Master。</Phrase>
75+
</Dictionary>
76+
</DrvModbusSlaveDictionaries>

‎LangPack/Chinese-Simplified/ScadaAdmin/Lang/DrvTelegram.zh-Hans.xml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DrvTelegramDictionaries>
3+
<Dictionary key="Scada.Comm.Drivers.DrvTelegram.View.Forms.FrmDeviceConfig">
4+
<Phrase key="this">设备 {0} 属性 - Telegram</Phrase>
5+
<Phrase key="lblBotToken">机器人令牌</Phrase>
6+
<Phrase key="btnPasteBotToken.ToolTip">粘贴机器人令牌</Phrase>
7+
<Phrase key="lblSubscr">订阅</Phrase>
8+
<Phrase key="btnAddSubscr.ToolTip">添加订阅</Phrase>
9+
<Phrase key="btnEditSubscr.ToolTip">编辑选定的订阅</Phrase>
10+
<Phrase key="btnDeleteSubscr.ToolTip">删除选定的订阅</Phrase>
11+
<Phrase key="btnCopySubscrName.ToolTip">复制订阅名称</Phrase>
12+
<Phrase key="colSubscrID">ID</Phrase>
13+
<Phrase key="colSubscrName">姓名</Phrase>
14+
<Phrase key="btnSave">节省</Phrase>
15+
<Phrase key="btnClose">关闭</Phrase>
16+
</Dictionary>
17+
<Dictionary key="Scada.Comm.Drivers.DrvTelegram.View.Forms.FrmSubscriptionOptions">
18+
<Phrase key="lblChatID">聊天ID</Phrase>
19+
<Phrase key="lblName">姓名</Phrase>
20+
<Phrase key="btnOK">好的</Phrase>
21+
<Phrase key="btnCancel">取消</Phrase>
22+
<Phrase key="NewSubscriptionTitle">新订阅</Phrase>
23+
<Phrase key="EditSubscriptionTitle">编辑订阅</Phrase>
24+
</Dictionary>
25+
</DrvTelegramDictionaries>

‎LangPack/Chinese-Simplified/ScadaAdmin/Lang/ModAutoControl.zh-Hans.xml

+165
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ModAutoControlDictionaries>
3+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Controls.CtrlCmdTrigger">
4+
<Phrase key="gbTrigger">触发器参数</Phrase>
5+
<Phrase key="chkActive">积极的</Phrase>
6+
<Phrase key="lblName">姓名</Phrase>
7+
<Phrase key="lblDescr">加薪</Phrase>
8+
<Phrase key="txtDescr">根据命令</Phrase>
9+
<Phrase key="lblCnlNum">渠道</Phrase>
10+
<Phrase key="lblCmdVal">价值</Phrase>
11+
<Phrase key="btnOff">离开</Phrase>
12+
<Phrase key="btnOn">在</Phrase>
13+
<Phrase key="lblCmdData">数据</Phrase>
14+
<Phrase key="cbCmdDataCompareOper.Items[0]">不检查</Phrase>
15+
<Phrase key="cbCmdDataCompareOper.Items[1]">等于</Phrase>
16+
<Phrase key="cbCmdDataCompareOper.Items[2]">包含</Phrase>
17+
<Phrase key="chkTransmitCmd">发送指令</Phrase>
18+
</Dictionary>
19+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Controls.CtrlCnlDataChangeTrigger">
20+
<Phrase key="gbTrigger">触发器参数</Phrase>
21+
<Phrase key="chkActive">积极的</Phrase>
22+
<Phrase key="lblName">姓名</Phrase>
23+
<Phrase key="lblDescr">加薪</Phrase>
24+
<Phrase key="txtDescr">通道数据变化</Phrase>
25+
<Phrase key="lblCnlNum">渠道</Phrase>
26+
</Dictionary>
27+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Controls.CtrlCnlDataTrigger">
28+
<Phrase key="gbTrigger">触发器参数</Phrase>
29+
<Phrase key="chkActive">积极的</Phrase>
30+
<Phrase key="lblName">姓名</Phrase>
31+
<Phrase key="lblDescr">加薪</Phrase>
32+
<Phrase key="txtDescr">频道数据</Phrase>
33+
<Phrase key="lblCnlNum">频道</Phrase>
34+
<Phrase key="lblCnlValCond">价值</Phrase>
35+
<Phrase key="lblDeadband">死区</Phrase>
36+
<Phrase key="lblCnlStat">状态</Phrase>
37+
<Phrase key="lblDelay">延迟，秒</Phrase>
38+
<Phrase key="lblRepeat">重复周期，秒</Phrase>
39+
<Phrase key="lblRepeatCnt">重复计数</Phrase>
40+
</Dictionary>
41+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Controls.CtrlEvTrigger">
42+
<Phrase key="gbTrigger">触发器参数</Phrase>
43+
<Phrase key="chkActive">积极的</Phrase>
44+
<Phrase key="lblName">姓名</Phrase>
45+
<Phrase key="lblDescr">加薪</Phrase>
46+
<Phrase key="txtDescr">活动现场</Phrase>
47+
<Phrase key="lblObjNum">目的</Phrase>
48+
<Phrase key="lblDeviceNum">设备</Phrase>
49+
<Phrase key="lblCnlNum">渠道</Phrase>
50+
<Phrase key="lblSeverity">严重性（最小值、最大值）</Phrase>
51+
<Phrase key="lblNewCnlValCond">新价值</Phrase>
52+
<Phrase key="lblNewCnlStat">新状态</Phrase>
53+
<Phrase key="lblTextCompareOper">文本</Phrase>
54+
<Phrase key="cbTextCompareOper.Items[0]">不检查</Phrase>
55+
<Phrase key="cbTextCompareOper.Items[1]">等于</Phrase>
56+
<Phrase key="cbTextCompareOper.Items[2]">包含</Phrase>
57+
<Phrase key="lblDataCompareOper">数据</Phrase>
58+
<Phrase key="cbDataCompareOper.Items[0]">不检查</Phrase>
59+
<Phrase key="cbDataCompareOper.Items[1]">等于</Phrase>
60+
<Phrase key="cbDataCompareOper.Items[2]">包含</Phrase>
61+
</Dictionary>
62+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Controls.CtrlTiggerGroup">
63+
<Phrase key="gbTriggerGroup">组参数</Phrase>
64+
<Phrase key="chkActive">积极的</Phrase>
65+
<Phrase key="lblName">姓名</Phrase>
66+
</Dictionary>
67+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Controls.CtrlTimeTrigger">
68+
<Phrase key="gbTrigger">触发器参数</Phrase>
69+
<Phrase key="chkActive">积极的</Phrase>
70+
<Phrase key="lblName">姓名</Phrase>
71+
<Phrase key="lblDescr">加薪</Phrase>
72+
<Phrase key="txtDescr">准时</Phrase>
73+
<Phrase key="rbEveryDay">每天</Phrase>
74+
<Phrase key="rbDaysOfWeek">星期几</Phrase>
75+
<Phrase key="rbDaysOfMonth">每月的天数</Phrase>
76+
<Phrase key="rbDates">日期</Phrase>
77+
<Phrase key="chkSun">太阳</Phrase>
78+
<Phrase key="chkMon">星期一</Phrase>
79+
<Phrase key="chkTue">星期二</Phrase>
80+
<Phrase key="chkWed">星期三</Phrase>
81+
<Phrase key="chkThu">星期四</Phrase>
82+
<Phrase key="chkFri">星期五</Phrase>
83+
<Phrase key="chkSat">星期六</Phrase>
84+
<Phrase key="lblTimes">提高次数</Phrase>
85+
</Dictionary>
86+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Controls.CtrlTriggerCommand">
87+
<Phrase key="gbCommand">命令参数</Phrase>
88+
<Phrase key="lblCnlNum">渠道</Phrase>
89+
<Phrase key="lblOr">或者</Phrase>
90+
<Phrase key="lblDeviceNum">设备</Phrase>
91+
<Phrase key="lblCmdNum">命令号</Phrase>
92+
<Phrase key="lblCmdCode">命令码</Phrase>
93+
<Phrase key="lblDelay">延迟，秒</Phrase>
94+
<Phrase key="chkSendOnFiring">开火时</Phrase>
95+
<Phrase key="chkSendOnNorm">关于归一化</Phrase>
96+
<Phrase key="chkCopyCmdVal">复制值和数据</Phrase>
97+
<Phrase key="rbNumVal">数字</Phrase>
98+
<Phrase key="rbStrData">字符串数据</Phrase>
99+
<Phrase key="rbHexData">十六进制数据</Phrase>
100+
<Phrase key="btnOff">离开</Phrase>
101+
<Phrase key="btnOn">在</Phrase>
102+
</Dictionary>
103+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Forms.FrmConditionEdit">
104+
<Phrase key="this">编辑条件</Phrase>
105+
<Phrase key="lblCompareOper1">比较操作。 1个</Phrase>
106+
<Phrase key="lblCompareArg1">参数 1</Phrase>
107+
<Phrase key="lblLogicalOper">逻辑操作。</Phrase>
108+
<Phrase key="cbLogicalOper.Items[0]">没有任何</Phrase>
109+
<Phrase key="cbLogicalOper.Items[1]">和</Phrase>
110+
<Phrase key="cbLogicalOper.Items[2]">或者</Phrase>
111+
<Phrase key="lblCompareOper2">比较操作。 2个</Phrase>
112+
<Phrase key="lblCompareArg2">论点 2</Phrase>
113+
<Phrase key="lblResult">结果</Phrase>
114+
<Phrase key="btnOK">好的</Phrase>
115+
<Phrase key="btnCancel">取消</Phrase>
116+
</Dictionary>
117+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Forms.FrmDateTimeAdd">
118+
<Phrase key="title1">添加日期</Phrase>
119+
<Phrase key="title2">添加时间</Phrase>
120+
<Phrase key="lblDate">日期</Phrase>
121+
<Phrase key="lblTime">时间</Phrase>
122+
<Phrase key="btnAdd">添加</Phrase>
123+
<Phrase key="btnClose">关闭</Phrase>
124+
</Dictionary>
125+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Forms.FrmDayAdd">
126+
<Phrase key="this">添加日期</Phrase>
127+
<Phrase key="lblDay">天</Phrase>
128+
<Phrase key="btnAdd">添加</Phrase>
129+
<Phrase key="btnClose">关闭</Phrase>
130+
</Dictionary>
131+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Forms.FrmGeneralOptions">
132+
<Phrase key="this">模块选项</Phrase>
133+
<Phrase key="lblUsername">用户名</Phrase>
134+
<Phrase key="btnOK">好的</Phrase>
135+
<Phrase key="btnCancel">取消</Phrase>
136+
</Dictionary>
137+
<Dictionary key="Scada.Server.Modules.ModAutoControl.View.Forms.FrmModuleConfig">
138+
<Phrase key="this">自动控制</Phrase>
139+
<Phrase key="btnAddTriggerGroup.ToolTip">添加触发组</Phrase>
140+
<Phrase key="btnAddCnlDataTrigger.ToolTip">添加通道数据触发器</Phrase>
141+
<Phrase key="btnAddCnlDataChangeTrigger.ToolTip">添加通道数据更改触发器</Phrase>
142+
<Phrase key="btnAddEvTrigger.ToolTip">添加事件触发器</Phrase>
143+
<Phrase key="btnAddTimeTrigger.ToolTip">添加时间触发器</Phrase>
144+
<Phrase key="btnAddCmdTrigger.ToolTip">添加命令触发器</Phrase>
145+
<Phrase key="btnAddCommand.ToolTip">添加命令</Phrase>
146+
<Phrase key="btnMoveUp.ToolTip">提升</Phrase>
147+
<Phrase key="btnMoveDown.ToolTip">下移</Phrase>
148+
<Phrase key="btnDelete.ToolTip">删除</Phrase>
149+
<Phrase key="btnCut.ToolTip">切</Phrase>
150+
<Phrase key="btnCopy.ToolTip">复制</Phrase>
151+
<Phrase key="btnPaste.ToolTip">粘贴</Phrase>
152+
<Phrase key="btnOptions.ToolTip">模块选项</Phrase>
153+
<Phrase key="gbTriggers">触发器</Phrase>
154+
<Phrase key="lblHint">添加触发器和命令</Phrase>
155+
<Phrase key="btnSave">节省</Phrase>
156+
<Phrase key="btnCancel">取消</Phrase>
157+
<Phrase key="btnClose">关闭</Phrase>
158+
<Phrase key="miCollapseAll">全部收缩</Phrase>
159+
<Phrase key="UnnamedGroup">&lt;未命名团体&gt;</Phrase>
160+
<Phrase key="UnnamedTrigger">&lt;未命名触发器&gt;</Phrase>
161+
<Phrase key="CommandDescr1">频道{0}</Phrase>
162+
<Phrase key="CommandDescr2">设备 {0}，命令 {1}</Phrase>
163+
<Phrase key="CopySuffix">- 复制</Phrase>
164+
</Dictionary>
165+
</ModAutoControlDictionaries>

0 commit comments

Comments
 (0)