diff --git a/WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx
index a3df4f0..d2c71ca 100644
--- a/WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx
+++ b/WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx
@@ -12,4 +12,18 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty
+of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see https://www.gnu.org/licenses/.
+
\ No newline at end of file
diff --git a/WinNUT_V2/WinNUT-Client/List_Var_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/List_Var_Gui.zh-CN.resx
index 6a53d9b..6602d44 100644
--- a/WinNUT_V2/WinNUT-Client/List_Var_Gui.zh-CN.resx
+++ b/WinNUT_V2/WinNUT-Client/List_Var_Gui.zh-CN.resx
@@ -22,19 +22,19 @@
名称：
- 物产
+ 项目属性
- 重装
+ 重载
- 清洁
+ 清空关闭
- 复印
+ 复制UPS变量列表
diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf
index fc8e303..985823b 100644
--- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf
+++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf
@@ -156,7 +156,7 @@
Item Properties
- 物产
+ 项目属性9, 300
@@ -172,7 +172,7 @@
Reload
- 重装
+ 重载102, 300
@@ -188,7 +188,7 @@
Clear
- 清洁
+ 清空289, 300
@@ -220,7 +220,7 @@
Copy
- 复印
+ 复制6, 13
@@ -717,7 +717,7 @@ Cancel to Save Msi and Install Later
Disconnected from Nut Host
- 从 Nut 主机断开了连接。
+ 从 Nut 主机断开了连接Try Reconnect {0} / {1}
@@ -789,37 +789,37 @@ Cancel to Save Msi and Install Later
Previous preferences data detected in the Registry.
- Previous preferences data detected in the Registry.
+ 在注册表中检测到以前的设置数据。Notify the user that preferences data from the old system was detected in the Registry hive.The old preferences have been imported.
- The old preferences have been imported.
+ 旧设置已经被导入。Notify the user that the import procedure has completed.There were {0} unknown preferences. See log for more details.
- There were {0} unknown preferences. See log for more details.
+ 有 {0} 个未知的设置。请查看日志获取更多详细信息。Alert the user to how many unmatched preferences there were {0}.The old preferences have been removed from your Registry.
- The old preferences have been removed from your Registry.
+ 旧设置已经从您的注册表中删除。Notify the user that the old preferences have been removed from their Registry.The upgrade process was cancelled: using default settings.
- The upgrade process was cancelled: using default settings.
+ 升级过程已取消：使用默认设置。Notify the user that the upgrade dialog was cancelled, and that default settings will be used instead.Save WinNUT Registry Key
- Save WinNUT Registry Key
+ 保存 WinNUT 注册表Title of the SaveFileDialog that prompts the user to select the file and location they would like to save their WinNUT Registry preferences to.The old preferences have been backed up to {0}
- The old preferences have been backed up to {0}
+ 旧设置已备份到 {0}Notify the user that the old preferences have been exported to a file, and give the full path with {0}.
@@ -828,11 +828,11 @@ Cancel to Save Msi and Install Later
{0}
Please correct the error, or cancel the upgrade dialog to continue with the default settings.
- An error occurred during the upgrade procedure:
+ 升级过程中发生错误：
{0}
-Please correct the error, or cancel the upgrade dialog to continue with the default settings.
+请修复错误，或取消升级对话框以继续使用默认设置。Alert the user that an error occurred during the upgrade procedure, attempt to give a brief summary of the error, and prompt them to take the next step.
@@ -841,27 +841,27 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
No preferences detected
- No preferences detected
+ 没有检测到设置A brief caption for the error message.No preferences were detected in the Registry. Unable to continue.
- No preferences were detected in the Registry. Unable to continue.
+ 您的系统中未检测到设置。无法继续操作。Alert the user that the dialog is unable to continue, since no preferences are detected in the Registry.Old preferences were not detected in your system.
- Old preferences were not detected in your system.
+ 您的系统中未检测到旧设置。Similar to _Enabled tooltip, except that the preferences were not detected.Old preferences detected. Click to run the import wizard.
- Old preferences detected. Click to run the import wizard.
+ 检测到旧设置。点击运行导入向导。Tooltip of the "manage old prefs" menu item, explaining that the old preferences were detected and that clicking will open the wizard dialog.Unavailable
- Unavailable
+ 参数无效Indicate that a variable is unavailable
@@ -1455,8 +1455,8 @@ Accepted value: Numeric value from 0 to 999.
Milliseconds between data updates from NUT server.
Min: 100, Max: 60 000.
- Milliseconds between data updates from NUT server.
-Min: 100, Max: 60 000.
+ 从NUT服务器更新数据时间间隔（单位：毫秒）。
+最小值: 100, 最大值: 60 000。154, 71
@@ -1495,7 +1495,7 @@ Accepted Value: Name of the UPS configured in the Nut server.
Nut Server Port Number (default = 3493).
Accepted value: Numeric value from 1 to 65535.
- Nut 服务Nut 服务器端口（默认为3493）。
+ Nut 服务Nut 服务器端口（默认为3493）。
取值：1-65535 之间的数值
@@ -1754,7 +1754,7 @@ Accepted value: IPV4 / IPV6 / FQDN address.
Write logging events to a file.
- Write logging events to a file.
+ 将日志事件写入文件。True
@@ -2237,7 +2237,7 @@ Accepted value: Numeric value from 0 to 100.
Frequency of verification.
- 验证频率。
+ 检查更新频率。True
@@ -2357,7 +2357,7 @@ Accepted value: Numeric value from 0 to 100.
Ok
- 好的
+ 确认186, 278
@@ -3758,7 +3758,7 @@ Accepted value: Numeric value from 0 to 100.
Manage Old Prefs...
- Manage Old Prefs...
+ 管理旧设置...
@@ -3817,9 +3817,7 @@ Accepted value: Numeric value from 0 to 100.
WinNUT has been upgraded to a new Settings and Preferences system, and must use that going forward. Items leftover from the previous system have been deteceted in your user Registry hive. Select the actions below that you would like to have performed on the old preferences. If you wish to take no action, select Cancel and the default settings will be used. This message will not be displayed again as long as the new program data remains intact.
- WinNUT has been upgraded to a new Settings and Preferences system, and must use that going forward. Items leftover from the previous system have been deteceted in your user Registry hive. Select the actions below that you would like to have performed on the old preferences. If you wish to take no action, select Cancel and the default settings will be used. This message will not be displayed again as long as the new program data remains intact.
-
-
+ WinNUT已经升级到一个新的设置和设置系统，并且必须继续使用它。在注册表中检测到了一些旧程序的设置。请从下面选择您希望对旧设置进行的操作。如果您不希望采取任何操作，请选择取消，将使用默认设置。只要新的程序数据保持完整，将不会再显示此消息。Right
@@ -3843,7 +3841,7 @@ Accepted value: Numeric value from 0 to 100.
OK
- OK
+ 确认Right
@@ -3867,7 +3865,7 @@ Accepted value: Numeric value from 0 to 100.
Cancel
- Cancel
+ 取消True
@@ -3891,11 +3889,11 @@ Accepted value: Numeric value from 0 to 100.
Import
- Import
+ 导入The previous preferences will be imported from the Registry and into the new Settings system.
- The previous preferences will be imported from the Registry and into the new Settings system.
+ 旧设置将从注册表导入到新的设置系统中。True
@@ -3919,11 +3917,11 @@ Accepted value: Numeric value from 0 to 100.
Delete
- Delete
+ 删除The previous preferences will be deleted from the Registry.
- The previous preferences will be deleted from the Registry.
+ 在注册表中检测到旧设置数据。Top, Left, Right
@@ -3951,11 +3949,11 @@ Accepted value: Numeric value from 0 to 100.
Backup
- Backup
+ 备份The previous settings will be exported to a file.
- The previous settings will be exported to a file.
+ 旧设置将被导出到文件中。6, 122
@@ -3975,7 +3973,7 @@ Accepted value: Numeric value from 0 to 100.
Previous Settings
- Previous Settings
+ 以前的设置Bottom
@@ -4043,7 +4041,7 @@ Accepted value: Numeric value from 0 to 100.
Migrate to New Settings Format
- Migrate to New Settings Format
+ 迁移到新设置格式488, 17
diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx
index 787e631..debcdbb 100644
--- a/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx
+++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx
@@ -89,7 +89,7 @@ Ini 文件重命名为 {0}.old
自动重连
- 从 Nut 主机断开了连接。
+ 从 Nut 主机断开了连接尝试重连 {0} / {1}
@@ -124,4 +124,50 @@ Ini 文件重命名为 {0}.old
..\Resources\regedit.exe_14_100-0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ https://github.com/nutdotnet/WinNUT-Client
+
+
+ 在注册表中检测到以前的设置数据。
+
+
+ 旧设置已经被导入。
+
+
+ 有 {0} 个未知的设置。请查看日志获取更多详细信息。
+
+
+ 旧设置已经从您的注册表中删除。
+
+
+ 升级过程已取消：使用默认设置。
+
+
+ 保存 WinNUT 注册表
+
+
+ 旧设置已备份到 {0}
+
+
+ 升级过程中发生错误：
+
+{0}
+
+请修复错误，或取消升级对话框以继续使用默认设置。
+
+
+ 没有检测到设置
+
+
+ 您的系统中未检测到设置。无法继续操作。
+
+
+ 您的系统中未检测到旧设置。
+
+
+ 检测到旧设置。点击运行导入向导。
+
+
+ 参数无效
+
\ No newline at end of file
diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx
index e9b0020..509deb8 100644
--- a/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx
+++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx
@@ -263,7 +263,7 @@
每月
- 验证频率。
+ 检查更新频率。稳定或开发分支
@@ -284,7 +284,7 @@
检查应用更新。
- 好的
+ 确认应用
@@ -316,4 +316,17 @@
Microsoft Sans Serif, 8.25pt, style=Italic
+
+ 50
+
+
+ 60
+
+
+ 从NUT服务器更新数据时间间隔（单位：毫秒）。
+最小值: 100, 最大值: 60 000。
+
+
+ 将日志事件写入文件。
+
\ No newline at end of file
diff --git a/WinNUT_V2/WinNUT-Client/UpgradePrefsDialog.zh-CN.resx b/WinNUT_V2/WinNUT-Client/UpgradePrefsDialog.zh-CN.resx
index e407c94..a0b1a0b 100644
--- a/WinNUT_V2/WinNUT-Client/UpgradePrefsDialog.zh-CN.resx
+++ b/WinNUT_V2/WinNUT-Client/UpgradePrefsDialog.zh-CN.resx
@@ -195,4 +195,39 @@
44
+
+ WinNUT已经升级到一个新的设置和设置系统，并且必须继续使用它。在注册表中检测到了一些旧程序的设置。请从下面选择您希望对旧设置进行的操作。如果您不希望采取任何操作，请选择取消，将使用默认设置。只要新的程序数据保持完整，将不会再显示此消息。
+
+
+
+
+ 确认
+
+
+ 取消
+
+
+ 导入
+
+
+ 旧设置将从注册表导入到新的设置系统中。
+
+
+ 删除
+
+
+ 在注册表中检测到旧设置数据。
+
+
+ 备份
+
+
+ 旧设置将被导出到文件中。
+
+
+ 以前的设置
+
+
+ 迁移到新设置格式
+
\ No newline at end of file
diff --git a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
index ac2ed99..bcb1654 100644
--- a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
+++ b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
@@ -257,6 +257,7 @@
Pref_Gui.vb
+ DesignerPref_Gui.vb
diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx b/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx
index 2395724..f965560 100644
--- a/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx
+++ b/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx
@@ -102,4 +102,16 @@
False
+
+ NotifyIcon1
+
+
+ MenuStrip1
+
+
+ WinNUT Client
+
+
+ 管理旧设置...
+
\ No newline at end of file
diff --git a/WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb b/WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb
index 7018e2b..fe7cd89 100644
--- a/WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb
+++ b/WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb
@@ -116,6 +116,8 @@ Public Enum UPS_States
TRIM = 1 << 11
BOOST = 1 << 12
ALARM = 1 << 13
+ ECO = 1 << 14 ' eConversion mode
+ RB = 1 << 15 ' Batteries need to be replaced
End Enum
Public Enum PowerMethod