Skip to content

Commit b5fe331

Browse files
gbakemangbakeman
authored
Merge pull request #152 from MaxMadcc/dev-2.3
Update zh-cn language and add UPS States flag
2 parents 12fa7ec + bce79f2 commit b5fe331

File tree

9 files changed

+167
-46
lines changed

9 files changed

+167
-46
lines changed

‎WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,18 @@
1212
<resheader name="writer">
1313
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
1414
</resheader>
15+
<data name="Label_License.Text" xml:space="preserve">
16+
<value>This program is free software: you can redistribute it and/or modify
17+
it under the terms of the GNU General Public License as published
18+
by the Free Software Foundation, either version 3 of the License, or
19+
any later version.
20+
21+
This program is distributed in the hope that it will be useful, but
22+
WITHOUT ANY WARRANTY; without even the implied warranty
23+
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
24+
See the GNU General Public License for more details.
25+
26+
You should have received a copy of the GNU General Public License
27+
along with this program. If not, see https://www.gnu.org/licenses/.</value>
28+
</data>
1529
</root>

‎WinNUT_V2/WinNUT-Client/List_Var_Gui.zh-CN.resx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
<value>名称：</value>
2323
</data>
2424
<data name="GB1.Text" xml:space="preserve">
25-
<value>物产</value>
25+
<value>项目属性</value>
2626
</data>
2727
<data name="Btn_Reload.Text" xml:space="preserve">
28-
<value>重装</value>
28+
<value>重载</value>
2929
</data>
3030
<data name="Btn_Clear.Text" xml:space="preserve">
31-
<value>清洁</value>
31+
<value>清空</value>
3232
</data>
3333
<data name="Btn_Close.Text" xml:space="preserve">
3434
<value>关闭</value>
3535
</data>
3636
<data name="Btn_Clip.Text" xml:space="preserve">
37-
<value>复印</value>
37+
<value>复制</value>
3838
</data>
3939
<data name="$this.Text" xml:space="preserve">
4040
<value>UPS变量列表</value>

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf‎

Lines changed: 37 additions & 39 deletions
Large diffs are not rendered by default.

‎WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Ini 文件重命名为 {0}.old</value>
8989
<value>自动重连</value>
9090
</data>
9191
<data name="Log_Str_05" xml:space="preserve">
92-
<value>从 Nut 主机断开了连接。</value>
92+
<value>从 Nut 主机断开了连接</value>
9393
</data>
9494
<data name="Log_Str_06" xml:space="preserve">
9595
<value>尝试重连 {0} / {1}</value>
@@ -124,4 +124,50 @@ Ini 文件重命名为 {0}.old</value>
124124
<data name="regedit_exe_14_100_0" xml:space="preserve" type="System.Resources.ResXFileRef, System.Windows.Forms">
125125
<value>..\Resources\regedit.exe_14_100-0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126126
</data>
127+
<data name="GitHub_URL" xml:space="preserve">
128+
<value>https://github.com/nutdotnet/WinNUT-Client</value>
129+
</data>
130+
<data name="DetectedPreviousPrefsData" xml:space="preserve">
131+
<value>在注册表中检测到以前的设置数据。</value>
132+
</data>
133+
<data name="UpgradePrefsDialog_ImportProcedureCompleted" xml:space="preserve">
134+
<value>旧设置已经被导入。</value>
135+
</data>
136+
<data name="UpgradePrefsDialog_UnmatchedPairs" xml:space="preserve">
137+
<value>有 {0} 个未知的设置。请查看日志获取更多详细信息。</value>
138+
</data>
139+
<data name="UpgradePrefsDialog_DeleteProcedureComplete" xml:space="preserve">
140+
<value>旧设置已经从您的注册表中删除。</value>
141+
</data>
142+
<data name="UpgradePrefsDialog_Cancelled" xml:space="preserve">
143+
<value>升级过程已取消：使用默认设置。</value>
144+
</data>
145+
<data name="UpgradePrefsDialog_BackupLocationTitle" xml:space="preserve">
146+
<value>保存 WinNUT 注册表</value>
147+
</data>
148+
<data name="UpgradePrefsDialog_BackupProcedureCompleted" xml:space="preserve">
149+
<value>旧设置已备份到 {0}</value>
150+
</data>
151+
<data name="UpgradePrefsDialog_ErrorEncountered" xml:space="preserve">
152+
<value>升级过程中发生错误：
153+
154+
{0}
155+
156+
请修复错误，或取消升级对话框以继续使用默认设置。</value>
157+
</data>
158+
<data name="UpgradePrefsDialog_NoPrefsExistCaption" xml:space="preserve">
159+
<value>没有检测到设置</value>
160+
</data>
161+
<data name="UpgradePrefsDialog_NoPrefsExistError" xml:space="preserve">
162+
<value>您的系统中未检测到设置。无法继续操作。</value>
163+
</data>
164+
<data name="ManageOldPrefsToolstripMenuItem_Disabled_TooltipText" xml:space="preserve">
165+
<value>您的系统中未检测到旧设置。</value>
166+
</data>
167+
<data name="ManageOldPrefsToolstripMenuItem_Enabled_TooltipText" xml:space="preserve">
168+
<value>检测到旧设置。点击运行导入向导。</value>
169+
</data>
170+
<data name="VariableUnavailable" xml:space="preserve">
171+
<value>参数无效</value>
172+
</data>
127173
</root>

‎WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
<value>每月</value>
264264
</data>
265265
<data name="Cbx_Delay_Verif.ToolTip" xml:space="preserve">
266-
<value>验证频率。</value>
266+
<value>检查更新频率。</value>
267267
</data>
268268
<data name="Lbl_Branch_Update.Text" xml:space="preserve">
269269
<value>稳定或开发分支</value>
@@ -284,7 +284,7 @@
284284
<value>检查应用更新。</value>
285285
</data>
286286
<data name="Btn_Ok.Text" xml:space="preserve">
287-
<value>好的</value>
287+
<value>确认</value>
288288
</data>
289289
<data name="Btn_Apply.Text" xml:space="preserve">
290290
<value>应用</value>
@@ -316,4 +316,17 @@
316316
<data name="Lbl_LoadUPS.Font" xml:space="preserve" type="System.Drawing.Font, System.Drawing">
317317
<value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
318318
</data>
319+
<data name="Cbx_Freq_Input.Items" xml:space="preserve">
320+
<value>50</value>
321+
</data>
322+
<data name="Cbx_Freq_Input.Items1" xml:space="preserve">
323+
<value>60</value>
324+
</data>
325+
<data name="Tb_Delay_Com.ToolTip" xml:space="preserve">
326+
<value>从NUT服务器更新数据时间间隔（单位：毫秒）。
327+
最小值: 100, 最大值: 60 000。</value>
328+
</data>
329+
<data name="CB_Use_Logfile.ToolTip" xml:space="preserve">
330+
<value>将日志事件写入文件。</value>
331+
</data>
319332
</root>

‎WinNUT_V2/WinNUT-Client/UpgradePrefsDialog.zh-CN.resx‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,39 @@
195195
<metadata name="$this.TrayHeight" xml:space="preserve" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
196196
<value>44</value>
197197
</metadata>
198+
<data name="IntroMessage.Text" xml:space="preserve">
199+
<value>WinNUT已经升级到一个新的设置和设置系统，并且必须继续使用它。在注册表中检测到了一些旧程序的设置。请从下面选择您希望对旧设置进行的操作。如果您不希望采取任何操作，请选择取消，将使用默认设置。只要新的程序数据保持完整，将不会再显示此消息。
200+
201+
</value>
202+
</data>
203+
<data name="OK_Button.Text" xml:space="preserve">
204+
<value>确认</value>
205+
</data>
206+
<data name="Cancel_Button.Text" xml:space="preserve">
207+
<value>取消</value>
208+
</data>
209+
<data name="ImportSettingsCheckBox.Text" xml:space="preserve">
210+
<value>导入</value>
211+
</data>
212+
<data name="ImportSettingsCheckBox.ToolTip" xml:space="preserve">
213+
<value>旧设置将从注册表导入到新的设置系统中。</value>
214+
</data>
215+
<data name="DeleteSettingsCheckBox.Text" xml:space="preserve">
216+
<value>删除</value>
217+
</data>
218+
<data name="DeleteSettingsCheckBox.ToolTip" xml:space="preserve">
219+
<value>在注册表中检测到旧设置数据。</value>
220+
</data>
221+
<data name="BackupSettingsCheckbox.Text" xml:space="preserve">
222+
<value>备份</value>
223+
</data>
224+
<data name="BackupSettingsCheckbox.ToolTip" xml:space="preserve">
225+
<value>旧设置将被导出到文件中。</value>
226+
</data>
227+
<data name="PrevSettngsGroupBox.Text" xml:space="preserve">
228+
<value>以前的设置</value>
229+
</data>
230+
<data name="$this.Text" xml:space="preserve">
231+
<value>迁移到新设置格式</value>
232+
</data>
198233
</root>

‎WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@
257257
</EmbeddedResource>
258258
<EmbeddedResource Include="Pref_Gui.resx">
259259
<DependentUpon>Pref_Gui.vb</DependentUpon>
260+
<SubType>Designer</SubType>
260261
</EmbeddedResource>
261262
<EmbeddedResource Include="Pref_Gui.ru-RU.resx">
262263
<DependentUpon>Pref_Gui.vb</DependentUpon>

‎WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,16 @@
102102
<data name="ManageOldPrefsToolStripMenuItem.Enabled" xml:space="preserve" type="System.Boolean, mscorlib">
103103
<value>False</value>
104104
</data>
105+
<data name="NotifyIcon.Text" xml:space="preserve">
106+
<value>NotifyIcon1</value>
107+
</data>
108+
<data name="Main_Menu.Text" xml:space="preserve">
109+
<value>MenuStrip1</value>
110+
</data>
111+
<data name="$this.Text" xml:space="preserve">
112+
<value>WinNUT Client</value>
113+
</data>
114+
<data name="ManageOldPrefsToolStripMenuItem.Text" xml:space="preserve">
115+
<value>管理旧设置...</value>
116+
</data>
105117
</root>

‎WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ Public Enum UPS_States
116116
TRIM = 1 << 11
117117
BOOST = 1 << 12
118118
ALARM = 1 << 13
119+
ECO = 1 << 14 ' eConversion mode
120+
RB = 1 << 15 ' Batteries need to be replaced
119121
End Enum
120122

121123
''' <summary>

0 commit comments

Comments
 (0)