Merge pull request #152 from MaxMadcc/dev-2.3

Update zh-cn language and add UPS States flag
nutdotnet · May 6, 2024 · b5fe331 · b5fe331
2 parents 12fa7ec + bce79f2
commit b5fe331
Show file tree

Hide file tree

Showing 9 changed files with 167 additions and 46 deletions.
diff --git a/WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx
@@ -12,4 +12,18 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Label_License.Text" xml:space="preserve">
+    <value>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/.</value>
+  </data>
 </root>
diff --git 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 @@
     <value>名称：</value>
   </data>
   <data name="GB1.Text" xml:space="preserve">
-    <value>物产</value>
+    <value>项目属性</value>
   </data>
   <data name="Btn_Reload.Text" xml:space="preserve">
-    <value>重装</value>
+    <value>重载</value>
   </data>
   <data name="Btn_Clear.Text" xml:space="preserve">
-    <value>清洁</value>
+    <value>清空</value>
   </data>
   <data name="Btn_Close.Text" xml:space="preserve">
     <value>关闭</value>
   </data>
   <data name="Btn_Clip.Text" xml:space="preserve">
-    <value>复印</value>
+    <value>复制</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>UPS变量列表</value>

diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf
diff --git 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</value>
     <value>自动重连</value>
   </data>
   <data name="Log_Str_05" xml:space="preserve">
-    <value>从 Nut 主机断开了连接。</value>
+    <value>从 Nut 主机断开了连接</value>
   </data>
   <data name="Log_Str_06" xml:space="preserve">
     <value>尝试重连 {0} / {1}</value>
@@ -124,4 +124,50 @@ Ini 文件重命名为 {0}.old</value>
   <data name="regedit_exe_14_100_0" xml:space="preserve" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\regedit.exe_14_100-0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="GitHub_URL" xml:space="preserve">
+    <value>https://github.com/nutdotnet/WinNUT-Client</value>
+  </data>
+  <data name="DetectedPreviousPrefsData" xml:space="preserve">
+    <value>在注册表中检测到以前的设置数据。</value>
+  </data>
+  <data name="UpgradePrefsDialog_ImportProcedureCompleted" xml:space="preserve">
+    <value>旧设置已经被导入。</value>
+  </data>
+  <data name="UpgradePrefsDialog_UnmatchedPairs" xml:space="preserve">
+    <value>有 {0} 个未知的设置。请查看日志获取更多详细信息。</value>
+  </data>
+  <data name="UpgradePrefsDialog_DeleteProcedureComplete" xml:space="preserve">
+    <value>旧设置已经从您的注册表中删除。</value>
+  </data>
+  <data name="UpgradePrefsDialog_Cancelled" xml:space="preserve">
+    <value>升级过程已取消：使用默认设置。</value>
+  </data>
+  <data name="UpgradePrefsDialog_BackupLocationTitle" xml:space="preserve">
+    <value>保存 WinNUT 注册表</value>
+  </data>
+  <data name="UpgradePrefsDialog_BackupProcedureCompleted" xml:space="preserve">
+    <value>旧设置已备份到 {0}</value>
+  </data>
+  <data name="UpgradePrefsDialog_ErrorEncountered" xml:space="preserve">
+    <value>升级过程中发生错误：
+
+{0}
+
+请修复错误，或取消升级对话框以继续使用默认设置。</value>
+  </data>
+  <data name="UpgradePrefsDialog_NoPrefsExistCaption" xml:space="preserve">
+    <value>没有检测到设置</value>
+  </data>
+  <data name="UpgradePrefsDialog_NoPrefsExistError" xml:space="preserve">
+    <value>您的系统中未检测到设置。无法继续操作。</value>
+  </data>
+  <data name="ManageOldPrefsToolstripMenuItem_Disabled_TooltipText" xml:space="preserve">
+    <value>您的系统中未检测到旧设置。</value>
+  </data>
+  <data name="ManageOldPrefsToolstripMenuItem_Enabled_TooltipText" xml:space="preserve">
+    <value>检测到旧设置。点击运行导入向导。</value>
+  </data>
+  <data name="VariableUnavailable" xml:space="preserve">
+    <value>参数无效</value>
+  </data>
 </root>
diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx
@@ -263,7 +263,7 @@
     <value>每月</value>
   </data>
   <data name="Cbx_Delay_Verif.ToolTip" xml:space="preserve">
-    <value>验证频率。</value>
+    <value>检查更新频率。</value>
   </data>
   <data name="Lbl_Branch_Update.Text" xml:space="preserve">
     <value>稳定或开发分支</value>
@@ -284,7 +284,7 @@
     <value>检查应用更新。</value>
   </data>
   <data name="Btn_Ok.Text" xml:space="preserve">
-    <value>好的</value>
+    <value>确认</value>
   </data>
   <data name="Btn_Apply.Text" xml:space="preserve">
     <value>应用</value>
@@ -316,4 +316,17 @@
   <data name="Lbl_LoadUPS.Font" xml:space="preserve" type="System.Drawing.Font, System.Drawing">
     <value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
   </data>
+  <data name="Cbx_Freq_Input.Items" xml:space="preserve">
+    <value>50</value>
+  </data>
+  <data name="Cbx_Freq_Input.Items1" xml:space="preserve">
+    <value>60</value>
+  </data>
+  <data name="Tb_Delay_Com.ToolTip" xml:space="preserve">
+    <value>从NUT服务器更新数据时间间隔（单位：毫秒）。
+最小值: 100, 最大值: 60 000。</value>
+  </data>
+  <data name="CB_Use_Logfile.ToolTip" xml:space="preserve">
+    <value>将日志事件写入文件。</value>
+  </data>
 </root>
diff --git a/WinNUT_V2/WinNUT-Client/UpgradePrefsDialog.zh-CN.resx b/WinNUT_V2/WinNUT-Client/UpgradePrefsDialog.zh-CN.resx
@@ -195,4 +195,39 @@
   <metadata name="$this.TrayHeight" xml:space="preserve" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>44</value>
   </metadata>
+  <data name="IntroMessage.Text" xml:space="preserve">
+    <value>WinNUT已经升级到一个新的设置和设置系统，并且必须继续使用它。在注册表中检测到了一些旧程序的设置。请从下面选择您希望对旧设置进行的操作。如果您不希望采取任何操作，请选择取消，将使用默认设置。只要新的程序数据保持完整，将不会再显示此消息。
+
+</value>
+  </data>
+  <data name="OK_Button.Text" xml:space="preserve">
+    <value>确认</value>
+  </data>
+  <data name="Cancel_Button.Text" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="ImportSettingsCheckBox.Text" xml:space="preserve">
+    <value>导入</value>
+  </data>
+  <data name="ImportSettingsCheckBox.ToolTip" xml:space="preserve">
+    <value>旧设置将从注册表导入到新的设置系统中。</value>
+  </data>
+  <data name="DeleteSettingsCheckBox.Text" xml:space="preserve">
+    <value>删除</value>
+  </data>
+  <data name="DeleteSettingsCheckBox.ToolTip" xml:space="preserve">
+    <value>在注册表中检测到旧设置数据。</value>
+  </data>
+  <data name="BackupSettingsCheckbox.Text" xml:space="preserve">
+    <value>备份</value>
+  </data>
+  <data name="BackupSettingsCheckbox.ToolTip" xml:space="preserve">
+    <value>旧设置将被导出到文件中。</value>
+  </data>
+  <data name="PrevSettngsGroupBox.Text" xml:space="preserve">
+    <value>以前的设置</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>迁移到新设置格式</value>
+  </data>
 </root>
diff --git a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
@@ -257,6 +257,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Pref_Gui.resx">
       <DependentUpon>Pref_Gui.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Pref_Gui.ru-RU.resx">
       <DependentUpon>Pref_Gui.vb</DependentUpon>

diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx b/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx
@@ -102,4 +102,16 @@
   <data name="ManageOldPrefsToolStripMenuItem.Enabled" xml:space="preserve" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
+  <data name="NotifyIcon.Text" xml:space="preserve">
+    <value>NotifyIcon1</value>
+  </data>
+  <data name="Main_Menu.Text" xml:space="preserve">
+    <value>MenuStrip1</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>WinNUT Client</value>
+  </data>
+  <data name="ManageOldPrefsToolStripMenuItem.Text" xml:space="preserve">
+    <value>管理旧设置...</value>
+  </data>
 </root>
diff --git 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
 
 ''' <summary>