Merge remote-tracking branch 'origin/master'

Author: gawindx

README.md

@@ -5,8 +5,8 @@
 ## Installation
 To use it, please follow the following steps:
 1. Get the [last available Releases](https://github.com/gawindx/WinNUT-Client/releases)
-2. Install WinNUT using the "WinNUT-Setup.msi" file obtained previously
-3. If you were using an older version of WinNUT (v1.x), copy your "ups.ini" configuration file to the WinNUT installation directory (by default "C: \ Program Files (x86) \ WinNUT-client ") for an automatic import of your parameters during the first launch
+2. Install WinNUT-Client using the "WinNUT-Setup.msi" file obtained previously
+3. If you were using an older version of WinNUT (v1.x), copy your "ups.ini" configuration file to the WinNUT-Client installation directory (by default "C:\Program Files(x86)\WinNUT-Client ") for an automatic import of your parameters during the first launch
 4. Start WinNUT V2 and modify the parameters according to your needs
 
 ## Specific Configuration
@@ -16,17 +16,18 @@ If your NUT server is hosted on a Synology NAS, be sure to provide the following
 Login: upsmon
 Password: secret
 
-It will probably be necessary to allow the WinNUT IP to communicate with the NUT server.
+It will probably be necessary to allow the WinNUT-Client IP to communicate with the NUT server.
 *See issue 47 for more information, specifically [this commentary](https://github.com/gawindx/WinNUT-Client/issues/47#issuecomment-759180793).*
 
 ### 
 ## Translation
-WinNUT V2 is natively multilingual, so it is no longer necessary to select your language from the software interface.
-Currently, WinNUT supports:
+WinNUT-Client V2 is natively multilingual, so it is no longer necessary to select your language from the software interface.
+Currently, WinNUT-Client supports:
 - English
 - German
 - French
 - Simplified Chinese
+- Russian
 
 #### To add / correct a language
 
@@ -56,12 +57,12 @@ Currently, WinNUT supports:
 
 Your translation / correction will be added on a new version and will thus be available to the entire community.
 
-## Update WinNut
+## Update WinNUT-Client
 
-Since version 1.8.0.0, WinNut includes a process for checking for updates.
+Since version 1.8.0.0, WinNUT-Client includes a process for checking for updates.
 This process can be started automatically on startup or manually on demand (and you can choose whether you want to update from the stable or development version)
 
-During this update, the new installation file will be automatically downloaded and you can easily update your version of WinNut.
+During this update, the new installation file will be automatically downloaded and you can easily update your version of WinNUT-Client.
 
 This process is fully integrated and no longer requires a second executable.
 
@@ -74,7 +75,7 @@ WinNUT-Client uses:
 
 ## License
 
-WinNUT is a NUT windows client for monitoring your ups hooked up to your favorite linux server.
+WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server.
 Copyright (C) 2019-2021 Gawindx (Decaux Nicolas)
 
 This program is free software: you can redistribute it and/or modify it under the terms of the
@@ -86,4 +87,4 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 ## Donation
 If you want to support this project or reward the work done, you can do so here:
 
-[![paypal](https://www.paypalobjects.com/en_US/FR/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/donate?hosted_button_id=FAFJ3ZKMENGCU)
+[![paypal](https://www.paypalobjects.com/en_US/FR/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/donate?hosted_button_id=FAFJ3ZKMENGCU)

README.txt

@@ -93,6 +93,8 @@ To validate,Gawindx,Notice,Notice
 To validate,Gawindx,NUT host,NUT Host
 To validate,Gawindx,NUT Port,NUT Port
 To validate,Gawindx,Nut server address. Accepted value: IPV4 / IPV6 / FQDN address.,Nut Server Adresse. Akzeptierter Wert: IPV4 / IPV6 / FQDN-Adresse.
+To validate,Gawindx,NUT server connection identifier,Verbindungskennung des NUT-Servers
+To validate,Gawindx,NUT server login password,Anmeldekennwort des NUT-Servers
 To validate,Gawindx,Nut Server Port Number (default = 3493). Accepted value: Numeric value from 1 to 65535.,Nut Server Port Number (Standard = 3493). Akzeptierter Wert: Numerischer Wert von 1 bis 65535.
 To validate,Gawindx,Ok,OK
 To validate,Gawindx,Old ups.ini imported,Alte ups.ini importiert
@@ -110,6 +112,7 @@ To validate,Gawindx,Reduced to the taskbar or Systray.,Reduziert auf die Tasklei
 To validate,Gawindx,Re-establish connection,Stellen Sie die Verbindung wieder her
 To validate,Gawindx,Reload,Neu laden
 To validate,Gawindx,Remaining Time :,Verbleibende Zeit :
+To validate,Gawindx,Restarting WinNUT after waking up from Windows.,Neustart von WinNUT nach dem Aufwachen von Windows.
 To validate,Gawindx,Sends in Systray at closing.,Sendet beim Schließen in Systray.
 To validate,Gawindx,Serial :,Seriennummer:
 To validate,Gawindx,Sets the input frequency if not supplied by the UPS.,Legt die Eingangsfrequenz fest wenn diese nicht von der USV geliefert wird.
@@ -154,4 +157,5 @@ To validate,Gawindx,Verify Update At Start,Überprüfen Sie das Update beim Star
 To validate,Gawindx,Version {0} Available,Version {0} Verfügbar
 To validate,Gawindx,Weekly,Wöchentlich
 To validate,Gawindx,WinNut Preferences Changed,WinNut-Einstellungen geändert
+To validate,Gawindx,Windows standby. WinNUT will disconnect.,Windows Standby. WinNUT wird getrennt.
 To validate,Gawindx,Wrong Login ID (Username or Password),Falsche Login-ID (Benutzername oder Passwort)

Translation/de-DE/de-DE.csv

@@ -93,6 +93,8 @@ Valid,Gawindx,Notice,Remarque
 Valid,Gawindx,NUT host,Serveur NUT
 Valid,Gawindx,NUT Port,Port NUT
 Valid,Gawindx,Nut server address. Accepted value: IPV4 / IPV6 / FQDN address.,Adresse du serveur Nut. Valeur acceptée: adresse IPV4 / IPV6 / FQDN.
+Valid,Gawindx,NUT server connection identifier,Identifiant de connexion au serveur NUT
+Valid,Gawindx,NUT server login password,Mot de Passe de connexion au serveur NUT
 Valid,Gawindx,Nut Server Port Number (default = 3493). Accepted value: Numeric value from 1 to 65535.,Numéro de port du serveur Nut (par défaut = 3493). Valeur acceptée: valeur numérique de 1 à 65535.
 Valid,Gawindx,Ok,Ok
 Valid,Gawindx,Old ups.ini imported,Ancien Fichier ups.ini importé
@@ -110,6 +112,7 @@ Valid,Gawindx,Reduced to the taskbar or Systray.,Réduit à la barre des tâches
 Valid,Gawindx,Re-establish connection,Reconnecter
 Valid,Gawindx,Reload,Recharger
 Valid,Gawindx,Remaining Time :,Temps de Sauvegarde :
+Valid,Gawindx,Restarting WinNUT after waking up from Windows.,Redémarrage de WinNUT après la sortie de veille de Windows.
 Valid,Gawindx,Sends in Systray at closing.,Envoie dans le Systray à la fermeture.
 Valid,Gawindx,Serial :,Serial :
 Valid,Gawindx,Sets the input frequency if not supplied by the UPS.,Règle la fréquence d'entrée si elle n'est pas fournie par l'onduleur.
@@ -154,4 +157,5 @@ Valid,Gawindx,Verify Update At Start,Vérifier la mise à jour au Démarrage
 Valid,Gawindx,Version {0} Available,Version {0} disponible
 Valid,Gawindx,Weekly,Hebdomadaire
 Valid,Gawindx,WinNut Preferences Changed,Préférences de WinNUT Modifiées
+Valid,Gawindx,Windows standby. WinNUT will disconnect.,Mise en veille de Windows. WinNUT va se déconnecter.
 Valid,Gawindx,Wrong Login ID (Username or Password),ID de connexion incorrect (nom d'utilisateur ou mot de passe)

Translation/fr-FR/fr-FR.csv

@@ -110,6 +110,7 @@ Status,Translator,Message,Translation
 ,,Re-establish connection,
 ,,Reload,
 ,,Remaining Time :,
+,,Restarting WinNUT after waking up from Windows.,
 ,,Sends in Systray at closing.,
 ,,Serial :,
 ,,Sets the input frequency if not supplied by the UPS.,
@@ -154,4 +155,5 @@ Status,Translator,Message,Translation
 ,,Version {0} Available,
 ,,Weekly,
 ,,WinNut Preferences Changed,
+,,Windows standby, WinNUT will disconnect.,
 ,,Wrong Login ID (Username or Password),