Skip to content
This repository has been archived by the owner on Feb 4, 2025. It is now read-only.

Commit

Permalink
###Version 2.0.7706
Browse files Browse the repository at this point in the history
###Version 2.0.7706
####Fix :
  - App crash when disconnecting with null streams (Thanks to tgp1994) (Issue #48)
  - Correction of a bad state of the Notify Icon Text when the return value of ups status is not only "OL" (Issue #45)
  - Add -f parameter to force shutdown (Issue #46)
  - Some modifications provided by tgp1994
  - Fixed a bug that could occur when using a value of "0" for the grace period (thanks to jcsmook - pull requests #55)
  - Fixed a bug generating an infinite connection / reconnection loop when the load value is retrieved to "0" during connection (thanks to jcsmook, pull requests # 55)
  - Correction of a code error causing the event time not to be updated in the logs.
  - Fixed an error causing an unhandled exception when you do not want to apply the update immediately and the installation file already exists at the location specified for saving.
  - In the case of a left click on the systray icon, WinNUT was restored to its original size and the context menu was opened at the same time.
  This behavior has been corrected and only the context menu opens.
  Restoring the WinNUT window to its original size is caused by a single or double click only.

####Added :
  - Addition of a directory containing the translations at the repository level.
	Makes it easier to submit a new translation (or correction) via a fork / pull request (nonPointer idea - issue #35)
  - Translation of the "List UPS Variable's" interface (translation forgot during v2.0)

####Changed :
  - Some changes on how logs work (Thanks to tgp1994)
  - Modification of the code to recover the power supply frequency of the UPS when it only provides the output frequency (modification made in response to an unsuccessful commit of pull requests # 55 - problem encountered by jcsmook)
  - Modification of the generated installer:
		- Addition of a custom image banner
		- Removal of the dependent Windows libraries installed in the WinNUT directory
  - The update process is no longer based on the "changelog.txt" of the repository but on the list of releases via the GitHub APIs.
  This modification has been implemented to avoid reproducing issue #53.
  This modification also brings the possibility of receiving both stable and development updates for those who choose to follow the development channel (the more recent of the two being the proposed update).
  - The changes made to the update process allow the implementation of a more suitable versioning of the type
    [Major Version].[Minor Version].[Automatic Build Version].[Automatic Revision Version]
  - Complete syntax review of Changelog.txt file
  • Loading branch information
gawindx committed Feb 5, 2021
1 parent ec3a8b0 commit 2934356
Show file tree
Hide file tree
Showing 19 changed files with 1,790 additions and 1,086 deletions.
4 changes: 2 additions & 2 deletions Translation/de-DE/de-DE.csv
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ To validate,Gawindx,Check for updates.,Auf Updates prüfen.
To validate,Gawindx,Checks for updates at startup.,Sucht beim Start nach Updates.
To validate,Gawindx,Clear,Leer
To validate,Gawindx,Close,Schließen
To validate,Gawindx,Close to Tray,In der Nähe von Tablett
To validate,Gawindx,Close to Systray,In der Nähe von Systray
To validate,Gawindx,Conditions met for launching the Extinguishing Process,Voraussetzungen für den Start des Löschprozesses
To validate,Gawindx,Connected,In Verbindung gebracht
To validate,Gawindx,Connection,Verbindung
Expand Down Expand Up @@ -78,7 +78,7 @@ To validate,Gawindx,Maximum input voltage. Accepted value: Numeric value from 0
To validate,Gawindx,Maximum Load Level of the UPS. Accepted value: Numeric value from 0 to 100.,Maximaler Lastpegel der USV. Akzeptierter Wert: Numerischer Wert von 0 bis 100.
To validate,Gawindx,Maximum Output Voltage. Accepted value: Numeric value from 0 to 999.,Maximale Ausgangsspannung. Akzeptierter Wert: Numerischer Wert von 0 bis 999.
To validate,Gawindx,Min,Min
To validate,Gawindx,Minimize to tray,Minimize to tray
To validate,Gawindx,Minimize to Systray,Auf Systray minimieren
To validate,Gawindx,Minimum Battery Voltage. Accepted value: Numeric value from 0 to 100.,Minimale Batteriespannung. Akzeptierter Wert: Numerischer Wert von 0 bis 100.
To validate,Gawindx,Minimum Charge Level of the UPS. Accepted value: Numeric value from 0 to 100.,Mindestladezustand der USV. Akzeptierter Wert: Numerischer Wert von 0 bis 100.
To validate,Gawindx,Minimum input frequency. Accepted value: Numeric value from 0 to 100.,Minimale Eingangsfrequenz. Akzeptierter Wert: Numerischer Wert von 0 bis 100.
Expand Down
4 changes: 2 additions & 2 deletions Translation/fr-FR/fr-FR.csv
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Valid,Gawindx,Check for updates.,Vérifiez les mises à jour.
Valid,Gawindx,Checks for updates at startup.,Vérifie les mises à jour au démarrage.
Valid,Gawindx,Clear,Vider
Valid,Gawindx,Close,Fermer
Valid,Gawindx,Close to Tray,Fermer vers la Barre de Tâche
Valid,Gawindx,Close to Tray,Fermer vers le Systray
Valid,Gawindx,Conditions met for launching the Extinguishing Process,Conditions atteintes pour le lancement du Processus d'Extinction
Valid,Gawindx,Connected,Connecté
Valid,Gawindx,Connection,Connexion
Expand Down Expand Up @@ -78,7 +78,7 @@ Valid,Gawindx,Maximum input voltage. Accepted value: Numeric value from 0 to 999
Valid,Gawindx,Maximum Load Level of the UPS. Accepted value: Numeric value from 0 to 100.,Niveau de charge maximum de l'onduleur. Valeur acceptée: valeur numérique de 0 à 100.
Valid,Gawindx,Maximum Output Voltage. Accepted value: Numeric value from 0 to 999.,Tension de sortie maximale. Valeur acceptée: valeur numérique de 0 à 999.
Valid,Gawindx,Min,Mini
Valid,Gawindx,Minimize to tray,Réduire en Barre de Tâche
Valid,Gawindx,Minimize to Systray,Réduire au Systray
Valid,Gawindx,Minimum Battery Voltage. Accepted value: Numeric value from 0 to 100.,Tension minimale de la batterie. Valeur acceptée: valeur numérique de 0 à 100.
Valid,Gawindx,Minimum Charge Level of the UPS. Accepted value: Numeric value from 0 to 100.,Niveau de charge minimum de l'onduleur. Valeur acceptée: valeur numérique de 0 à 100.
Valid,Gawindx,Minimum input frequency. Accepted value: Numeric value from 0 to 100.,Fréquence d'entrée minimale. Valeur acceptée: valeur numérique de 0 à 100.
Expand Down
4 changes: 2 additions & 2 deletions Translation/new_translation.csv
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Status,Translator,Message,Translation
,,Checks for updates at startup.,
,,Clear,
,,Close,
,,Close to Tray,
,,Close to Systray,
,,Conditions met for launching the Extinguishing Process,
,,Connected,
,,Connection,
Expand Down Expand Up @@ -78,7 +78,7 @@ Status,Translator,Message,Translation
,,Maximum Load Level of the UPS. Accepted value: Numeric value from 0 to 100.,
,,Maximum Output Voltage. Accepted value: Numeric value from 0 to 999.,
,,Min,
,,Minimize to tray,
,,Minimize to Systray,
,,Minimum Battery Voltage. Accepted value: Numeric value from 0 to 100.,
,,Minimum Charge Level of the UPS. Accepted value: Numeric value from 0 to 100.,
,,Minimum input frequency. Accepted value: Numeric value from 0 to 100.,
Expand Down
4 changes: 2 additions & 2 deletions Translation/zh-CN/zh-CN.csv
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Valid,nonPointer,Check for updates.,检查应用更新。
Valid,nonPointer,Checks for updates at startup.,在启动时检查更新。
To Validate,Gawindx,Clear,清洁
Valid,nonPointer,Close,关闭
Valid,nonPointer,Close to Tray,关闭时缩小至托盘
To Validate,Gawindx,Close to Systray,靠近Systray
Valid,nonPointer,Conditions met for launching the Extinguishing Process,触发关机流程所需满足的条件
Valid,nonPointer,Connected,已连接
Valid,nonPointer,Connection,连接
Expand Down Expand Up @@ -78,7 +78,7 @@ Valid,nonPointer,Maximum input voltage. Accepted value: Numeric value from 0 to
Valid,nonPointer,Maximum Load Level of the UPS. Accepted value: Numeric value from 0 to 100.,最高 UPS 电量等级。取值:0-100 之间的数值。
Valid,nonPointer,Maximum Output Voltage. Accepted value: Numeric value from 0 to 999.,最高输出电压。取值:0-999 之间的数值。
Valid,nonPointer,Min,最低
Valid,nonPointer,Minimize to tray,缩小至任务栏。
To Validate,Gawindx,Minimize to tray,最小化到系统托盘
Valid,nonPointer,Minimum Battery Voltage. Accepted value: Numeric value from 0 to 100.,最低电池电压。取值:0-100 之间的数值。
Valid,nonPointer,Minimum Charge Level of the UPS. Accepted value: Numeric value from 0 to 100.,最低 UPS 电量等级。取值:0-100 之间的数值。
Valid,nonPointer,Minimum input frequency. Accepted value: Numeric value from 0 to 100.,最低输入频率。取值:0-100 之间的数值。
Expand Down
73 changes: 58 additions & 15 deletions WinNUT_V2/Setup/Setup.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@
}
"Entry"
{
"MsmKey" = "8:_3AE119B8ED2B789D525357C468BE19EF"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4BE9E7A4C40C5D84B7877AE7226B4700"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -526,13 +532,13 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"OwnerKey" = "8:_314CE5030A4040E69371869B1C94AA16"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_99295A60B760C5A7B2A217EF6A2482C4"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -580,6 +586,18 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_3AE119B8ED2B789D525357C468BE19EF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_99295A60B760C5A7B2A217EF6A2482C4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_FCA495396E81C2795D7E927FDE9AA986"
"MsmSig" = "8:_UNDEFINED"
}
Expand Down Expand Up @@ -889,12 +907,6 @@
"OwnerKey" = "8:_5F45EF116DEF98C6EB00FE13ECFD9E23"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_314CE5030A4040E69371869B1C94AA16"
"MsmSig" = "8:_UNDEFINED"
}
}
"Configurations"
{
Expand Down Expand Up @@ -1360,6 +1372,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3AE119B8ED2B789D525357C468BE19EF"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_3AE119B8ED2B789D525357C468BE19EF"
{
"Name" = "8:Newtonsoft.Json.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Newtonsoft.Json.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4BE9E7A4C40C5D84B7877AE7226B4700"
{
"AssemblyRegister" = "3:1"
Expand Down Expand Up @@ -1872,7 +1915,7 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
Expand Down Expand Up @@ -2554,7 +2597,7 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
Expand Down Expand Up @@ -3006,22 +3049,22 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WinNUT"
"ProductCode" = "8:{8FD70CC7-6A88-4FB5-9163-8ED103AF4113}"
"PackageCode" = "8:{BB8F6A25-C27B-4877-95D0-7B4C0CC1BA45}"
"ProductCode" = "8:{0D9937E7-243B-4822-9452-9FFEC71398FE}"
"PackageCode" = "8:{A15A4814-3781-4480-B949-CB6F9D867AF2}"
"UpgradeCode" = "8:{7EA17151-76E7-4E29-8F6A-621C1B4144C2}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:2.0.5"
"ProductVersion" = "8:2.0.7706"
"Manufacturer" = "8:Gawindx"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://github.com/gawindx/WinNUT-Client"
"Title" = "8:WinNUT-Setup"
"Subject" = "8:WinNUT-Client v2.0.5.0"
"Subject" = "8:WinNUT-Client v2.0.7706"
"ARPCONTACT" = "8:Gawindx"
"Keywords" = "8:WinNUT v2.0.5.0"
"Keywords" = "8:WinNUT v2.0.7706"
"ARPCOMMENTS" = "8:Windows NUT Client"
"ARPURLINFOABOUT" = "8:"
"ARPPRODUCTICON" = "8:"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -671,8 +671,8 @@
<target state="final">2</target>
</trans-unit>
<trans-unit id="CB_Close_Tray.Text" translate="yes" xml:space="preserve">
<source>Close to Tray</source>
<target state="final">In der Nähe von Tablett</target>
<source>Close to Systray</source>
<target state="final">In der Nähe von Systray</target>
</trans-unit>
<trans-unit id="CB_Start_Mini.AutoSize" translate="no" extype="System.Boolean, mscorlib" xml:space="preserve">
<source>True</source>
Expand Down Expand Up @@ -735,8 +735,8 @@
<target state="final">0</target>
</trans-unit>
<trans-unit id="CB_Systray.Text" translate="yes" xml:space="preserve">
<source>Minimize to tray</source>
<target state="final">Minimize to tray</target>
<source>Minimize to Systray</source>
<target state="final">Auf Systray minimieren</target>
</trans-unit>
<trans-unit id="Tab_Miscellanous.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
<source>4, 22</source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -673,8 +673,8 @@
<target state="final">2</target>
</trans-unit>
<trans-unit id="CB_Close_Tray.Text" translate="yes" xml:space="preserve">
<source>Close to Tray</source>
<target state="final">Fermer vers la Barre de Tâche</target>
<source>Close to Systray</source>
<target state="final">Fermer vers le Systray</target>
</trans-unit>
<trans-unit id="CB_Start_Mini.AutoSize" translate="no" extype="System.Boolean, mscorlib" xml:space="preserve">
<source>True</source>
Expand Down Expand Up @@ -737,8 +737,8 @@
<target state="final">0</target>
</trans-unit>
<trans-unit id="CB_Systray.Text" translate="yes" xml:space="preserve">
<source>Minimize to tray</source>
<target state="final">Réduire en Barre de Tâche</target>
<source>Minimize to Systray</source>
<target state="final">Réduire au Systray</target>
</trans-unit>
<trans-unit id="Tab_Miscellanous.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
<source>4, 22</source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15424,8 +15424,8 @@ Accepted value: IPV4 / IPV6 / FQDN address.</source>
<target state="final">2</target>
</trans-unit>
<trans-unit id="CB_Close_Tray.Text" translate="yes" xml:space="preserve">
<source>Close to Tray</source>
<target state="final">关闭时缩小至托盘</target>
<source>Close to Systray</source>
<target state="final">靠近Systray</target>
</trans-unit>
<trans-unit id="CB_Close_Tray.ToolTip" translate="yes" xml:space="preserve">
<source>Sends in Systray at closing.</source>
Expand Down Expand Up @@ -15496,8 +15496,8 @@ Accepted value: IPV4 / IPV6 / FQDN address.</source>
<target state="final">0</target>
</trans-unit>
<trans-unit id="CB_Systray.Text" translate="yes" xml:space="preserve">
<source>Minimize to tray</source>
<target state="final">缩小至任务栏。</target>
<source>Minimize to Systray</source>
<target state="final">最小化到系统托盘</target>
</trans-unit>
<trans-unit id="CB_Systray.ToolTip" translate="yes" xml:space="preserve">
<source>Reduced to the taskbar or Systray.</source>
Expand Down
3 changes: 1 addition & 2 deletions WinNUT_V2/WinNUT_GUI/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ Imports System.Runtime.InteropServices
' en utilisant '*', comme indiqué ci-dessous :
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("2.0.5.0")>
<Assembly: AssemblyFileVersion("2.0.5.0")>
<Assembly: AssemblyVersion("2.0.*")>
<Assembly: NeutralResourcesLanguage("en-US")>
4 changes: 2 additions & 2 deletions WinNUT_V2/WinNUT_GUI/Pref_Gui.de-DE.resx
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@
<value>Starte mit Windows</value>
</data>
<data name="CB_Close_Tray.Text" xml:space="preserve">
<value>In der Nähe von Tablett</value>
<value>In der Nähe von Systray</value>
</data>
<data name="CB_Start_Mini.Text" xml:space="preserve">
<value>Minimiert starten</value>
</data>
<data name="CB_Systray.Text" xml:space="preserve">
<value>Minimize to tray</value>
<value>Auf Systray minimieren</value>
</data>
<data name="Tab_Miscellanous.Text" xml:space="preserve">
<value>Verschiedenes</value>
Expand Down
4 changes: 2 additions & 2 deletions WinNUT_V2/WinNUT_GUI/Pref_Gui.fr-FR.resx
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@
<value>Démmarrer avec Windows</value>
</data>
<data name="CB_Close_Tray.Text" xml:space="preserve">
<value>Fermer vers la Barre de Tâche</value>
<value>Fermer vers le Systray</value>
</data>
<data name="CB_Start_Mini.Text" xml:space="preserve">
<value>Démarrer Réduit</value>
</data>
<data name="CB_Systray.Text" xml:space="preserve">
<value>Réduire en Barre de Tâche</value>
<value>Réduire au Systray</value>
</data>
<data name="Tab_Miscellanous.Text" xml:space="preserve">
<value>Divers</value>
Expand Down
Loading

0 comments on commit 2934356

Please sign in to comment.