Skip to content

Commit 788cdd3

Browse files
gbakemangbakeman
authored
Merge pull request #112 from nutdotnet/41-fix-power-display
Correct UPS Load display
2 parents 86b3d2e + c9aec9e commit 788cdd3

23 files changed

+4780
-80514
lines changed

‎WinNUT_V2/WinNUT-Client/List_Var_Gui.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Public Class List_Var_Gui
127127
Private Sub TView_UPSVar_NodeChanged(sender As Object, e As TreeViewEventArgs) Handles TView_UPSVar.AfterSelect
128128
Dim index As Integer = 0
129129
Dim UPSName = Arr_Reg_Key.Item("UPSName")
130-
Dim SelectedChild = Replace(e.Node.FullPath, UPSName & ".", "")
130+
Dim SelectedChild = Replace(e.Node.FullPath, UPSName & ".", "", 1, 1)
131131
Dim FindChild As Predicate(Of UPS_List_Datas) = Function(ByVal x As UPS_List_Datas)
132132
If x.VarKey = SelectedChild Then
133133
Return True

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf‎

Lines changed: 500 additions & 14344 deletions
Large diffs are not rendered by default.

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf‎

Lines changed: 514 additions & 14358 deletions
Large diffs are not rendered by default.

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf‎

Lines changed: 513 additions & 14359 deletions
Large diffs are not rendered by default.

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf‎

Lines changed: 540 additions & 14386 deletions
Large diffs are not rendered by default.

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

Lines changed: 519 additions & 14365 deletions
Large diffs are not rendered by default.

‎WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb‎

Lines changed: 16 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@
186186
<data name="Tb_BattV_Max.ToolTip" xml:space="preserve">
187187
<value>Maximale Akkuspannung. Wertebereich: Numerischer Wert von 0 bis 100.</value>
188188
</data>
189-
<data name="Tb_Load_Max.ToolTip" xml:space="preserve">
190-
<value>Maximaler Last der USV. Wertebereich: Numerischer Wert von 0 bis 100.</value>
191-
</data>
192189
<data name="Tb_OutV_Max.ToolTip" xml:space="preserve">
193190
<value>Maximale Ausgangsspannung. Wertebereich: Numerischer Wert von 0 bis 999.</value>
194191
</data>
@@ -198,9 +195,6 @@
198195
<data name="Tb_BattV_Min.ToolTip" xml:space="preserve">
199196
<value>Minimale Akkuspannung. Wertebereich: Numerischer Wert von 0 bis 100.</value>
200197
</data>
201-
<data name="Tb_Load_Min.ToolTip" xml:space="preserve">
202-
<value>Mindestladezustand der USV. Wertebereich: Numerischer Wert von 0 bis 100.</value>
203-
</data>
204198
<data name="Tb_OutV_Min.ToolTip" xml:space="preserve">
205199
<value>Minimale Ausgangsspannung. Wertebereich: Numerischer Wert von 0 bis 999.</value>
206200
</data>
@@ -294,4 +288,19 @@
294288
<data name="CB_Follow_FSD.ToolTip" xml:space="preserve">
295289
<value>Gibt an ob ein Herunterfahren durchgeführt werden soll wenn der NUT-Server ein erzwungenes Herunterfahren signalisiert (FSD = Force ShutDown).</value>
296290
</data>
291+
<data name="Cbx_Freq_Input.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
292+
<value>3, 6, 3, 3</value>
293+
</data>
294+
<data name="Tb_BattV_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
295+
<value>3, 6, 3, 3</value>
296+
</data>
297+
<data name="Tb_OutV_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
298+
<value>3, 6, 3, 3</value>
299+
</data>
300+
<data name="Tb_InF_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
301+
<value>3, 6, 3, 3</value>
302+
</data>
303+
<data name="Lbl_LoadUPS.Font" xml:space="preserve" type="System.Drawing.Font, System.Drawing">
304+
<value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
305+
</data>
297306
</root>

‎WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,6 @@ Valeur acceptée: adresse IPV4 / IPV6 / FQDN.</value>
192192
</data>
193193
<data name="Tb_BattV_Max.ToolTip" xml:space="preserve">
194194
<value>Tension maximale de la batterie.
195-
Valeur acceptée: valeur numérique de 0 à 100.</value>
196-
</data>
197-
<data name="Tb_Load_Max.ToolTip" xml:space="preserve">
198-
<value>Niveau de charge maximum de l'onduleur.
199195
Valeur acceptée: valeur numérique de 0 à 100.</value>
200196
</data>
201197
<data name="Tb_OutV_Max.ToolTip" xml:space="preserve">
@@ -208,10 +204,6 @@ Valeur acceptée: valeur numérique de 0 à 100.</value>
208204
</data>
209205
<data name="Tb_BattV_Min.ToolTip" xml:space="preserve">
210206
<value>Tension minimale de la batterie.
211-
Valeur acceptée: valeur numérique de 0 à 100.</value>
212-
</data>
213-
<data name="Tb_Load_Min.ToolTip" xml:space="preserve">
214-
<value>Niveau de charge minimum de l'onduleur.
215207
Valeur acceptée: valeur numérique de 0 à 100.</value>
216208
</data>
217209
<data name="Tb_OutV_Min.ToolTip" xml:space="preserve">
@@ -317,4 +309,19 @@ Valeur acceptée: valeur numérique de 0 à 100.</value>
317309
<data name="CB_Follow_FSD.ToolTip" xml:space="preserve">
318310
<value>Indique si une extinction doit être executé lorsque le serveur NUT signal une extinction forcée (FSD=Force ShutDown)</value>
319311
</data>
312+
<data name="Cbx_Freq_Input.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
313+
<value>3, 6, 3, 3</value>
314+
</data>
315+
<data name="Tb_BattV_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
316+
<value>3, 6, 3, 3</value>
317+
</data>
318+
<data name="Tb_OutV_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
319+
<value>3, 6, 3, 3</value>
320+
</data>
321+
<data name="Tb_InF_Max.Margin" xml:space="preserve" type="System.Windows.Forms.Padding, System.Windows.Forms">
322+
<value>3, 6, 3, 3</value>
323+
</data>
324+
<data name="Lbl_LoadUPS.Font" xml:space="preserve" type="System.Drawing.Font, System.Drawing">
325+
<value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
326+
</data>
320327
</root>

0 commit comments

Comments
 (0)