Skip to content

Commit

Permalink
Merge pull request #95 from RapidScada/develop
Browse files Browse the repository at this point in the history 
Merge Develop to Master
  • Loading branch information
@2mik
2mik authored Oct 15, 2024
2 parents e827db4 + 749bba1 commit 97dea38
Show file tree
Hide file tree
Showing 435 changed files with 6,477 additions and 2,012 deletions.
42 changes: 42 additions & 0 deletions LangPack/Chinese-Simplified/ScadaAdmin/Lang/DrvDbImport.en-GB.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<DrvDbImportDictionaries>
<Dictionary key="Scada.Comm.Drivers.DrvDbImport.View.Controls.CtrlCommand">
<Phrase key="gbCommand">Command Parameters</Phrase>
<Phrase key="lblName">Name</Phrase>
<Phrase key="lblCmdCode">Command code</Phrase>
<Phrase key="lblCmdCodeWarn">Fill out code</Phrase>
<Phrase key="lblSql">SQL</Phrase>
<Phrase key="pbSqlInfo.ToolTip">Avaliable parameters: @cmdVal, @cmdData</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvDbImport.View.Controls.CtrlQuery">
<Phrase key="gbQuery">Query Parameters</Phrase>
<Phrase key="chkActive">Active</Phrase>
<Phrase key="lblName">Name</Phrase>
<Phrase key="lblTag">Tags</Phrase>
<Phrase key="lblSQL">SQL</Phrase>
<Phrase key="chkSingleRow">Single row result</Phrase>
<Phrase key="pbTagInfo.ToolTip">Each line contains a tag code.</Phrase>
<Phrase key="pbSqlInfo.ToolTip">ON - request returns a single row, each field of which contains a tag value.&#13;&#10;OFF - request returns a set of rows, each row contains a tag value. Required columns: code and val.</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvDbImport.View.Forms.FrmDeviceConfig">
<Phrase key="this">Device {0} Properties - DB Import</Phrase>
<Phrase key="btnAddQuery.ToolTip">Add Query</Phrase>
<Phrase key="btnAddCommand.ToolTip">Add Command</Phrase>
<Phrase key="btnMoveUp.ToolTip">Move Up</Phrase>
<Phrase key="btnMoveDown.ToolTip">Move Down</Phrase>
<Phrase key="btnDelete.ToolTip">Delete</Phrase>
<Phrase key="gbDevice">Device Configuration</Phrase>
<Phrase key="btnSave">Save</Phrase>
<Phrase key="btnCancel">Cancel</Phrase>
<Phrase key="btnClose">Close</Phrase>
<Phrase key="miCollapseAll">Collapse All</Phrase>
<Phrase key="ConnectionNode">Connection Options</Phrase>
<Phrase key="CommandName">Command {0}</Phrase>
<Phrase key="CommandsNode">Commands</Phrase>
<Phrase key="QueryName">Query {0}</Phrase>
<Phrase key="QueriesNode">Queries</Phrase>
<Phrase key="SelectChildNode">Select child node</Phrase>
<Phrase key="UnnamedCommand">&lt;Unnamed Command&gt;</Phrase>
<Phrase key="UnnamedQuery">&lt;Unnamed Query&gt;</Phrase>
</Dictionary>
</DrvDbImportDictionaries>
3 changes: 2 additions & 1 deletion LangPack/Chinese-Simplified/ScadaAdmin/Lang/DrvDsMqtt.zh-Hans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<Phrase key="pageConnectionOptions">连接</Phrase>
<Phrase key="lblServer">服务器</Phrase>
<Phrase key="lblPort"> TCP端口</Phrase>
<Phrase key="lblTimeout">超时时间, ms</Phrase>
<Phrase key="lblUseTls">Use TLS</Phrase>
<Phrase key="lblClientID">客户端ID</Phrase>
<Phrase key="lblUsername">用户名</Phrase>
<Phrase key="lblPassword">密码</Phrase>
<Phrase key="lblTimeout">超时时间, ms</Phrase>
<Phrase key="lblProtocolVersion">协议版本</Phrase>
<Phrase key="cbProtocolVersion.Items[0]">默认</Phrase>
<Phrase key="cbProtocolVersion.Items[1]">3.1</Phrase>
Expand Down
5 changes: 0 additions & 5 deletions LangPack/Chinese-Simplified/ScadaAdmin/Lang/DrvModbus.zh-Hans.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<DrvModbusDictionaries culture="zh-Hans" lang="ChineseSimplified">
<Dictionary key="Scada.Comm.Drivers.DrvModbus.Config.DeviceTemplate">
<Phrase key="LoadTemplateError">加载设备模板发生错误</Phrase>
<Phrase key="SaveTemplateError">保存设备模板发生错误</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvModbus.View.Controls">
<Phrase key="AddressHint">{0}, 从 {1} 开始</Phrase>
<Phrase key="ElemRemoveWarning">数据块最多允许 {0} 元素.&#13;&#10;多余的元素将被删除。 继续?</Phrase>
Expand Down Expand Up @@ -79,7 +75,6 @@
<Phrase key="gbDevice">设备</Phrase>
<Phrase key="lblTemplateFileName">设备模板</Phrase>
<Phrase key="btnBrowseTemplate">浏览模板...</Phrase>
<Phrase key="btnCreateTemplate">创建模板</Phrase>
<Phrase key="btnEditTemplate">编辑模板</Phrase>
<Phrase key="btnOK">确定</Phrase>
<Phrase key="btnCancel">取消</Phrase>
Expand Down
127 changes: 78 additions & 49 deletions LangPack/Chinese-Simplified/ScadaAdmin/Lang/DrvOpcClassic.zh-Hans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,98 +2,127 @@
<DrvOpcClassicDictionaries culture="zh-Hans" lang="ChineseSimplified">
<Dictionary key="Scada.Comm.Drivers.DrvOpcUa.View.Controls.CtrlCommand">
<Phrase key="gbCommand">命令参数</Phrase>
<Phrase key="lblDisplayName">显示名称</Phrase>
<Phrase key="lblPath">Path</Phrase>
<Phrase key="lblName">Name</Phrase>
<Phrase key="lblCmdCode">命令代码</Phrase>
<Phrase key="lblCmdNum">命令编号</Phrase>
<Phrase key="lblNodeID">节点 ID</Phrase>
<Phrase key="lblParentNodeID">父节点ID</Phrase>
<Phrase key="lblCmdNum">命令编号</Phrase>
<Phrase key="lblDataType">数据类型</Phrase>
<Phrase key="chkIsMethod">是否方法</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcClassic.View.Controls.CtrlEmptyItem">
<Phrase key="gbEmptyItem">项参数</Phrase>
<Phrase key="lblNotSelected">未选择项</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcClassic.View.Controls.CtrlEventCategory">
<Phrase key="gbEventCategory">Category Parameters</Phrase>
<Phrase key="lblName">Name</Phrase>
<Phrase key="lblID">ID</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcClassic.View.Controls.CtrlEventSubscription">
<Phrase key="gbSubscription">Subscription Parameters</Phrase>
<Phrase key="chkActive">Active</Phrase>
<Phrase key="lblDisplayName">Display name</Phrase>
<Phrase key="lblUpdateRate">Update rate, ms</Phrase>
<Phrase key="lblKeepAlive">Keep alive, ms</Phrase>
<Phrase key="lblMaxSize">Maximum size</Phrase>
<Phrase key="chkSimpleEvents">Simple events</Phrase>
<Phrase key="chkTrackingEvents">Tracking events</Phrase>
<Phrase key="chkConditionEvents">Condition events</Phrase>
<Phrase key="lblHighSeverity">High severity</Phrase>
<Phrase key="lblLowSeverity">Low severity</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcUa.View.Controls.CtrlItem">
<Phrase key="gbItem">项参数</Phrase>
<Phrase key="chkItemActive">活动</Phrase>
<Phrase key="lblDisplayName">显示名称</Phrase>
<Phrase key="chkActive">Active</Phrase>
<Phrase key="lblPath">Path</Phrase>
<Phrase key="lblName">Name</Phrase>
<Phrase key="lblTagCode">标签代码</Phrase>
<Phrase key="lblTagNum">标签号</Phrase>
<Phrase key="lblNodeID">节点 ID</Phrase>
<Phrase key="lblDataType">数据类型</Phrase>
<Phrase key="chkIsString">是否 字符串</Phrase>
<Phrase key="chkIsArray">是否数组</Phrase>
<Phrase key="lblDataLen">字符串或者数据长度</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcUa.View.Controls.CtrlSubscription">
<Phrase key="gbSubscription">订阅参数</Phrase>
<Phrase key="chkSubscrActive">活动</Phrase>
<Phrase key="chkActive">Active</Phrase>
<Phrase key="lblDisplayName">显示名称</Phrase>
<Phrase key="lblPublishingInterval">发布间隔</Phrase>
<Phrase key="lblUpdateRate">Update rate, ms</Phrase>
<Phrase key="lblKeepAlive">Keep alive, ms</Phrase>
<Phrase key="lblDeadband">Deadband, %</Phrase>
<Phrase key="chkReadSync">Read synchronously</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcUa.View.Forms.FrmDeviceConfig">
<Phrase key="this">设备 {0} 属性 - OPC UA</Phrase>
<Phrase key="gbConnectionOptions">连接选项</Phrase>
<Phrase key="lblServerUrl">服务器URL</Phrase>
<Phrase key="btnSecurityOptions.ToolTip">安全选项</Phrase>
<Phrase key="lblHost">Remote host</Phrase>
<Phrase key="btnShowNetworkOptions">Options</Phrase>
<Phrase key="lblServerPath">OPC server</Phrase>
<Phrase key="lblDaSpec">DA specification</Phrase>
<Phrase key="lblAeSpec">AE specification</Phrase>
<Phrase key="btnSelectServer">Select...</Phrase>
<Phrase key="lblConnectionInfo">连接选项是通信线路通用的。</Phrase>
<Phrase key="gbServerBrowse">浏览服务器</Phrase>
<Phrase key="btnConnect.ToolTip">连接到服务器</Phrase>
<Phrase key="btnDisconnect.ToolTip">断开服务器连接</Phrase>
<Phrase key="btnViewAttrs.ToolTip">查看属性</Phrase>
<Phrase key="btnOpenFile.ToolTip">Open File</Phrase>
<Phrase key="gbDevice">配置设备</Phrase>
<Phrase key="btnAddItem.ToolTip">添加选定项</Phrase>
<Phrase key="btnAddSubscription.ToolTip">添加订阅</Phrase>
<Phrase key="btnAddItem.ToolTip">添加选定项</Phrase>
<Phrase key="btnMoveUpItem.ToolTip">向上移动</Phrase>
<Phrase key="btnMoveDownItem.ToolTip">向下移动</Phrase>
<Phrase key="btnDeleteItem.ToolTip">删除</Phrase>
<Phrase key="btnEditingOptions">选项</Phrase>
<Phrase key="btnSave">保存</Phrase>
<Phrase key="btnClose">关闭</Phrase>
<Phrase key="ConnectServerError">连接到 OPC 服务器发生错误</Phrase>
<Phrase key="DisconnectServerError">断开OPC服务器连接发生错误</Phrase>
<Phrase key="XmlFileFilter">XML Files (*.xml)|*.xml|All Files (*.*)|*.*</Phrase>
<Phrase key="ServerNotSelected">OPC server not selected.</Phrase>
<Phrase key="DaServerUnavailable">OPC DA server is unavailable or does not support the selected specification.</Phrase>
<Phrase key="AeServerUnavailable">OPC AE server is unavailable or does not support the selected specification.</Phrase>
<Phrase key="ConnectDaServerError">Error connecting OPC DA server</Phrase>
<Phrase key="ConnectAeServerError">Error connecting OPC AE server</Phrase>
<Phrase key="DisconnectDaServerError">Error disconnecting OPC DA server</Phrase>
<Phrase key="DisconnectAeServerError">Error disconnecting OPC AE server</Phrase>
<Phrase key="BrowseServerError">浏览 OPC 服务器项发生错误</Phrase>
<Phrase key="LoadServerContentError">Error loading OPC server content</Phrase>
<Phrase key="ServerNotConnected">OPC server is not connected.</Phrase>
<Phrase key="UnableToReadData">无法读取数据。</Phrase>
<Phrase key="GetDataTypeError">获取数据类型发生错误</Phrase>
<Phrase key="ServerUrlRequired">服务器 URL 不能为空。</Phrase>
<Phrase key="DaServerNode">OPC DA</Phrase>
<Phrase key="AeServerNode">OPC AE</Phrase>
<Phrase key="EmptyNode">空</Phrase>
<Phrase key="SubscriptionsNode">订阅</Phrase>
<Phrase key="CommandsNode">命令</Phrase>
<Phrase key="EventSubscriptionsNode">Event Subscriptions</Phrase>
<Phrase key="UnnamedSubscription">&lt; 未命名的订阅&gt;</Phrase>
<Phrase key="UnnamedItem">&lt;未命名项 &gt;</Phrase>
<Phrase key="UnnamedCommand">&lt;未命名的命令&gt;</Phrase>
<Phrase key="UnknownDataType">数据类型 &quot;{0}&quot; 是未知的。</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcUa.View.Forms.FrmEditingOptions">
<Phrase key="this">编辑选项</Phrase>
<Phrase key="lblDefaultTagCode">默认标签代码</Phrase>
<Phrase key="cbDefaultTagCode.Items[0]">节点 ID</Phrase>
<Phrase key="cbDefaultTagCode.Items[1]">显示名称</Phrase>
<Phrase key="btnOK">确定</Phrase>
<Phrase key="btnCancel">取消</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcUa.View.Forms.FrmNodeAttr">
<Phrase key="this">节点属性</Phrase>
<Phrase key="colName">名称</Phrase>
<Phrase key="colValue">值</Phrase>
<Phrase key="btnClose">关闭</Phrase>
<Phrase key="ReadAttrError">从 OPC 服务器读取属性发生错误</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcUa.View.Forms.FrmSecurityOptions">
<Phrase key="this">安全选项</Phrase>
<Phrase key="lblSecurityMode">安全模式</Phrase>
<Phrase key="cbSecurityMode.Items[0]">None</Phrase>
<Phrase key="cbSecurityMode.Items[1]">Sign</Phrase>
<Phrase key="cbSecurityMode.Items[2]">Sign 和 encrypt</Phrase>
<Phrase key="lblSecurityPolicy">安全策略</Phrase>
<Phrase key="cbSecurityPolicy.Items[0]">None</Phrase>
<Phrase key="lblAuthenticationMode">认证模式</Phrase>
<Phrase key="cbAuthenticationMode.Items[0]">匿名</Phrase>
<Phrase key="cbAuthenticationMode.Items[1]">用户名和密码</Phrase>
<Phrase key="lblUsername">用户名</Phrase>
<Phrase key="lblPassword">密码</Phrase>
<Phrase key="btnOK">确定</Phrase>
<Phrase key="btnCancel">取消</Phrase>
<Dictionary key="Scada.Comm.Drivers.DrvOpcClassic.View.Forms.FrmNetworkOptions">
<Phrase key="this">Network Options</Phrase>
<Phrase key="chkIsDefault">Use default options</Phrase>
<Phrase key="gbCredentials">Credentials</Phrase>
<Phrase key="lblUsername">Username</Phrase>
<Phrase key="lblPassword">Password</Phrase>
<Phrase key="lblDomain">Domain</Phrase>
<Phrase key="gbProxy">Web Proxy</Phrase>
<Phrase key="lblProxyAddress">Address</Phrase>
<Phrase key="btnOK">OK</Phrase>
<Phrase key="btnCancel">Cancel</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvOpcClassic.View.Forms.FrmServerSelect">
<Phrase key="this">Select OPC Server</Phrase>
<Phrase key="lblHost">Host</Phrase>
<Phrase key="lblServer">OPC server</Phrase>
<Phrase key="gbDaSpec">DA Specification</Phrase>
<Phrase key="rbDaNone">None</Phrase>
<Phrase key="rbDa10">Data Access 1.0a</Phrase>
<Phrase key="rbDa20">Data Access 2.XX</Phrase>
<Phrase key="rbDa30">Data Access 3.00</Phrase>
<Phrase key="gbAeSpec">AE Specification</Phrase>
<Phrase key="rbAeNone">None</Phrase>
<Phrase key="rbAe10">Alarms and Events 1.XX</Phrase>
<Phrase key="btnOK">OK</Phrase>
<Phrase key="btnCancel">Cancel</Phrase>
<Phrase key="FillServersError">Error filling server list</Phrase>
<Phrase key="DisposeServersError">Error disposing servers</Phrase>
</Dictionary>
</DrvOpcClassicDictionaries>
48 changes: 48 additions & 0 deletions LangPack/Chinese-Simplified/ScadaAdmin/Lang/DrvSnmp.en-GB.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8" ?>
<DrvSnmpDictionaries>
<Dictionary key="Scada.Comm.Drivers.DrvSnmp.Config.DeviceOptions">
<Phrase key="ReadCommunity.DisplayName">Read community</Phrase>
<Phrase key="ReadCommunity.Category">Main Parameters</Phrase>
<Phrase key="ReadCommunity.Description">The password for reading data.</Phrase>
<Phrase key="WriteCommunity.DisplayName">Write community</Phrase>
<Phrase key="WriteCommunity.Category">Main Parameters</Phrase>
<Phrase key="WriteCommunity.Description">The password for writing data.</Phrase>
<Phrase key="SnmpVersion.DisplayName">SNMP version</Phrase>
<Phrase key="SnmpVersion.Category">Main Parameters</Phrase>
<Phrase key="SnmpVersion.Description">The protocol version. Supported versions are 1 and 2.</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvSnmp.Config.VarGroupConfig">
<Phrase key="Active.DisplayName">Active</Phrase>
<Phrase key="Active.Category">Main Parameters</Phrase>
<Phrase key="Active.Description">A value indicating whether the group is active.</Phrase>
<Phrase key="Name.DisplayName">Name</Phrase>
<Phrase key="Name.Category">Main Parameters</Phrase>
<Phrase key="Name.Description">The group name.</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvSnmp.Config.VariableConfig">
<Phrase key="Name.DisplayName">Name</Phrase>
<Phrase key="Name.Category">Main Parameters</Phrase>
<Phrase key="Name.Description">The variable name.</Phrase>
<Phrase key="TagCode.DisplayName">Tag code</Phrase>
<Phrase key="TagCode.Category">Main Parameters</Phrase>
<Phrase key="TagCode.Description">The tag code associated with the variable.</Phrase>
<Phrase key="OID.DisplayName">OID</Phrase>
<Phrase key="OID.Category">Main Parameters</Phrase>
<Phrase key="OID.Description">The object identifier. For example, .1.3.6.1.2.1.1.5.0</Phrase>
<Phrase key="DataType.DisplayName">Data type</Phrase>
<Phrase key="DataType.Category">Main Parameters</Phrase>
<Phrase key="DataType.Description">The data type of the device tag associated with the variable.</Phrase>
<Phrase key="DataLen.DisplayName">Data length</Phrase>
<Phrase key="DataLen.Category">Main Parameters</Phrase>
<Phrase key="DataLen.Description">The data length if the variable represents a string or an array. For strings, this is the number of characters. Otherwise, the number of 8-byte blocks.</Phrase>
</Dictionary>
<Dictionary key="Scada.Comm.Drivers.DrvSnmp.View.SnmpConfigProvider">
<Phrase key="FormTitle">Device {0} Properties - SNMP</Phrase>
<Phrase key="AddVarGroupButton">Add Group</Phrase>
<Phrase key="AddVariableButton">Add Variable</Phrase>
<Phrase key="OptionsNode">Options</Phrase>
<Phrase key="VarGroupsNode">Variable Groups</Phrase>
<Phrase key="UnnamedGroup">&lt;Unnamed Group&gt;</Phrase>
<Phrase key="UnnamedVariable">&lt;Unnamed Variable&gt;</Phrase>
</Dictionary>
</DrvSnmpDictionaries>
11 changes: 11 additions & 0 deletions LangPack/Chinese-Simplified/ScadaAdmin/Lang/ExtDepPostgreSql.zh-Hans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
<Phrase key="ClearBase">清除配置数据库</Phrase>
<Phrase key="CreateBase">创建配置数据库</Phrase>
<Phrase key="DeleteTable">删除表 {0} </Phrase>
<Phrase key="TruncateTable">Truncate the {0} table</Phrase>
<Phrase key="CreateTable">创建表 {0} </Phrase>
<Phrase key="FillTable">Fill the {0} table</Phrase>
<Phrase key="CreateFKs">创建外键</Phrase>
<Phrase key="CreateTableFKs">为表 {0} 创建外键</Phrase>
<Phrase key="ClearViews">清除视图</Phrase>
Expand All @@ -23,4 +25,13 @@
<Phrase key="CreateConfigFile">创建 &quot;{0}&quot; 的配置</Phrase>
<Phrase key="UnableRestartServices">由于代理已禁用，无法重启服务</Phrase>
</Dictionary>
<Dictionary key="Scada.Admin.Extensions.ExtDepPostgreSql.Config.ClearBaseMethod">
<Phrase key="DropTables">Drop tables</Phrase>
<Phrase key="TruncateTables">Truncate tables</Phrase>
</Dictionary>
<Dictionary key="Scada.Admin.Extensions.ExtDepPostgreSql.Config.ExtensionConfig">
<Phrase key="ClearBaseMethod.DisplayName">Clear method</Phrase>
<Phrase key="ClearBaseMethod.Category">Main Parameters</Phrase>
<Phrase key="ClearBaseMethod.Description">The method for clearing the configuration database. The truncate method is possible if the tables have already been created.</Phrase>
</Dictionary>
</ExtDepPostgreSqlDictionaries>
Loading

0 comments on commit 97dea38

Please sign in to comment.