Skip to content

Commit

Permalink
Merge pull request #131 from nutdotnet/129-overflowexception-updateba…
Browse files Browse the repository at this point in the history
…tterystate

Standard Exception logging subroutine, variable error handling, misc. bugfixes
  • Loading branch information
gbakeman committed Feb 28, 2024
2 parents 0920799 + e70c718 commit d68496a
Show file tree
Hide file tree
Showing 17 changed files with 799 additions and 1,584 deletions.
2 changes: 1 addition & 1 deletion WinNUT_V2/WinNUT-Client/About_Gui.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Imports WinNUT_Client_Common

Public Class About_Gui
Private Sub About_Gui_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Lbl_ProgNameVersion.Text = LongProgramName & vbNewLine & "Version " & ProgramVersion
Lbl_ProgNameVersion.Text = ProgramName & vbNewLine & "Version " & ProgramVersion
Lbl_Copyright_2019.Text = Replace(Copyright, "©", vbNewLine & "©")
LkLbl_Github.Text = GitHubURL
Icon = WinNUT.Icon
Expand Down
2 changes: 1 addition & 1 deletion WinNUT_V2/WinNUT-Client/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<value>0</value>
</setting>
<setting name="UP_LastCheck" serializeAs="String">
<value/>
<value />
</setting>
<setting name="PW_BattChrgFloor" serializeAs="String">
<value>30</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1742,9 +1742,10 @@ Accepted value: Numeric value from 0 to 100.</source>
<target state="translated">除錯</target>
</trans-unit>
<trans-unit id="Tb_Delay_Com.ToolTip" translate="yes" xml:space="preserve">
<source>Time between each update of UPS data (default = 5).
Accepted value: Numerical value from 1 to 60 seconds.</source>
<target state="translated">UPS 資料更新頻率 (預設值 5 秒)。範圍:1-60 秒。</target>
<source>Milliseconds between data updates from NUT server.
Min: 100, Max: 60 000.</source>
<target state="needs-review-translation">UPS 資料更新頻率 (預設值 5 秒)。範圍:1-60 秒。</target>
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
</trans-unit>
<trans-unit id="Label3.ImeMode" translate="no" extype="System.Windows.Forms.ImeMode, System.Windows.Forms" xml:space="preserve">
<source>NoControl</source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1235,9 +1235,10 @@
<target state="final">17, 17</target>
</trans-unit>
<trans-unit id="Tb_Delay_Com.ToolTip" translate="yes" xml:space="preserve">
<source>Time between each update of UPS data (default = 5).
Accepted value: Numerical value from 1 to 60 seconds.</source>
<target state="translated">Zeit zwischen jeder Aktualisierung der USV-Daten (Standard = 5).Wertebereich: Numerischer Wert von 1 bis 60 Sekunden.</target>
<source>Milliseconds between data updates from NUT server.
Min: 100, Max: 60 000.</source>
<target state="needs-review-translation">Zeit zwischen jeder Aktualisierung der USV-Daten (Standard = 5).Wertebereich: Numerischer Wert von 1 bis 60 Sekunden.</target>
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
</trans-unit>
<trans-unit id="Tb_UPS_Name.ToolTip" translate="yes" xml:space="preserve">
<source>UPS name to monitor.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1238,10 +1238,11 @@ inférieur à</target>
<target state="final">17, 17</target>
</trans-unit>
<trans-unit id="Tb_Delay_Com.ToolTip" translate="yes" xml:space="preserve">
<source>Time between each update of UPS data (default = 5).
Accepted value: Numerical value from 1 to 60 seconds.</source>
<target state="final">Temps entre chaque mise à jour des données UPS (par défaut = 5).
<source>Milliseconds between data updates from NUT server.
Min: 100, Max: 60 000.</source>
<target state="needs-review-translation">Temps entre chaque mise à jour des données UPS (par défaut = 5).
Valeur acceptée: valeur numérique de 1 à 60 secondes.</target>
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
</trans-unit>
<trans-unit id="Tb_UPS_Name.ToolTip" translate="yes" xml:space="preserve">
<source>UPS name to monitor.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1274,10 +1274,11 @@ along with this program. If not, see https://www.gnu.org/licenses/.</target>
<target state="final">12</target>
</trans-unit>
<trans-unit id="Tb_Delay_Com.ToolTip" translate="yes" xml:space="preserve">
<source>Time between each update of UPS data (default = 5).
Accepted value: Numerical value from 1 to 60 seconds.</source>
<target state="final">Время между обновлениями данных ИБП (по умолчанию = 5).
<source>Milliseconds between data updates from NUT server.
Min: 100, Max: 60 000.</source>
<target state="needs-review-translation">Время между обновлениями данных ИБП (по умолчанию = 5).
Число от 1 до 60 секунд.</target>
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
</trans-unit>
<trans-unit id="Tb_UPS_Name.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
<source>154, 71</source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1438,10 +1438,11 @@ Accepted value: Numeric value from 0 to 999.</source>
<target state="final">12</target>
</trans-unit>
<trans-unit id="Tb_Delay_Com.ToolTip" translate="yes" xml:space="preserve">
<source>Time between each update of UPS data (default = 5).
Accepted value: Numerical value from 1 to 60 seconds.</source>
<target state="final">每次更新UPS数据之间的时间(默认= 5)。
<source>Milliseconds between data updates from NUT server.
Min: 100, Max: 60 000.</source>
<target state="needs-review-translation">每次更新UPS数据之间的时间(默认= 5)。
接受值:1到60秒之间的数值。</target>
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
</trans-unit>
<trans-unit id="Tb_UPS_Name.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
<source>154, 71</source>
Expand Down
27 changes: 27 additions & 0 deletions WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions WinNUT_V2/WinNUT-Client/My Project/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,14 @@ Cancel to Save Msi and Install Later</value>
<data name="Log_Str_12" xml:space="preserve">
<value>Stop condition imposed by the NUT server</value>
</data>
<data name="ManageOldPrefsToolstripMenuItem_Disabled_TooltipText" xml:space="preserve">
<value>Old preferences were not detected in your system.</value>
<comment>Similar to _Enabled tooltip, except that the preferences were not detected.</comment>
</data>
<data name="ManageOldPrefsToolstripMenuItem_Enabled_TooltipText" xml:space="preserve">
<value>Old preferences detected. Click to run the import wizard.</value>
<comment>Tooltip of the "manage old prefs" menu item, explaining that the old preferences were detected and that clicking will open the wizard dialog.</comment>
</data>
<data name="regedit_exe_14_100_0" 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>
Expand Down Expand Up @@ -367,6 +375,10 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
<data name="ups_104x104" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ups_104x104.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="VariableUnavailable" xml:space="preserve">
<value>Unavailable</value>
<comment>Indicate that a variable is unavailable</comment>
</data>
<data name="ViewLogFile_24x24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ViewLogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand Down
2 changes: 1 addition & 1 deletion WinNUT_V2/WinNUT-Client/My Project/Settings.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d68496a

Please sign in to comment.