Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Persistent Connection attempts, quieter notifications #171

Merged
merged 3 commits into from
Aug 3, 2024
Merged

Persistent Connection attempts, quieter notifications #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09965f9
WinNUT UI tweaks w.r.t connections
gbakeman Jul 25, 2024
25a7284
Fix WinNUT string being applied to window title
gbakeman Jul 25, 2024
886613f
Persistent connections/indefinite reconnections
gbakeman Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 76 additions & 28 deletions WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,10 +635,6 @@ Ini File Moved to {0}.old</source>
<source>Reconnection In Progress</source>
<target state="translated">正在重新連線</target>
</trans-unit>
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
<source>Try {0} of {1}</source>
<target state="translated">重試第 {0} 次，共 {1} 次</target>
</trans-unit>
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
<source>Not Connected</source>
<target state="translated">未連線</target>
Expand Down Expand Up @@ -734,14 +730,6 @@ Cancel to Save Msi and Install Later</source>
<source>Disconnected from Nut Host</source>
<target state="translated">已與 NUT 伺服器中斷連線。</target>
</trans-unit>
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
<source>Try Reconnect {0} / {1}</source>
<target state="translated">重試連線 {0} / {1}</target>
</trans-unit>
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
<source>Max Retry reached. Wait for manual Reconnection</source>
<target state="translated">已達最大重試次數，等待手動重新連線。</target>
</trans-unit>
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
<source>Conditions met for launching the Extinguishing Process</source>
<target state="translated">啟動停機程序的條件</target>
Expand Down Expand Up @@ -859,6 +847,18 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
<target state="new">Unavailable</target>
<note from="MultilingualBuild" annotates="source" priority="2">Indicate that a variable is unavailable</note>
</trans-unit>
<trans-unit id="RepeatHS" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
<source>..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
<target state="needs-review-translation">..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
</trans-unit>
<trans-unit id="disconnect2" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
<source>..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
<target state="needs-review-translation">..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
</trans-unit>
<trans-unit id="internetconnection" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
<source>..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
<target state="needs-review-translation">..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
</trans-unit>
</group>
</body>
</file>
Expand Down Expand Up @@ -2562,8 +2562,8 @@ Accepted value: Numeric value from 0 to 100.</source>
<target state="translated">UPS 變數</target>
</trans-unit>
<trans-unit id="Menu_Quit.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>180, 22</source>
<target state="final">180, 22</target>
<source>177, 22</source>
<target state="final">177, 22</target>
</trans-unit>
<trans-unit id="Menu_Quit.Text" translate="yes" xml:space="preserve">
<source>Exit</source>
Expand All @@ -2577,17 +2577,9 @@ Accepted value: Numeric value from 0 to 100.</source>
<source>File</source>
<target state="translated">檔案</target>
</trans-unit>
<trans-unit id="Menu_Reconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>133, 22</source>
<target state="final">133, 22</target>
</trans-unit>
<trans-unit id="Menu_Reconnect.Text" translate="yes" xml:space="preserve">
<source>Reconnect</source>
<target state="translated">重新連線</target>
</trans-unit>
<trans-unit id="Menu_Disconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>133, 22</source>
<target state="final">133, 22</target>
<source>180, 22</source>
<target state="final">180, 22</target>
</trans-unit>
<trans-unit id="Menu_Disconnect.Text" translate="yes" xml:space="preserve">
<source>Disconnect</source>
Expand Down Expand Up @@ -2646,8 +2638,8 @@ Accepted value: Numeric value from 0 to 100.</source>
<target state="final">0, 24</target>
</trans-unit>
<trans-unit id="Main_Menu.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>351, 24</source>
<target state="final">351, 24</target>
<source>231, 24</source>
<target state="final">231, 24</target>
</trans-unit>
<trans-unit id="Main_Menu.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
<source>0</source>
Expand Down Expand Up @@ -3758,8 +3750,8 @@ Accepted value: Numeric value from 0 to 100.</source>
<target state="needs-review-translation">False</target>
</trans-unit>
<trans-unit id="ManageOldPrefsToolStripMenuItem.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>180, 22</source>
<target state="new">180, 22</target>
<source>177, 22</source>
<target state="needs-review-translation">177, 22</target>
</trans-unit>
<trans-unit id="ManageOldPrefsToolStripMenuItem.Text" translate="yes" xml:space="preserve">
<source>Manage Old Prefs...</source>
Expand All @@ -3769,6 +3761,62 @@ Accepted value: Numeric value from 0 to 100.</source>
<source></source>
<target state="new"></target>
</trans-unit>
<trans-unit id="Menu_Connect.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
<source>180, 22</source>
<target state="needs-review-translation">180, 22</target>
</trans-unit>
<trans-unit id="Menu_Connect.Text" translate="yes" xml:space="preserve">
<source>Connect</source>
<target state="new">Connect</target>
</trans-unit>
<trans-unit id="AG_InV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_OutV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_BattCh.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_Load.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_BattV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_InF.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="ToolStripSeparator1.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
<source>177, 6</source>
<target state="needs-review-translation">177, 6</target>
</trans-unit>
<trans-unit id="Menu_Persist.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
<source>180, 22</source>
<target state="needs-review-translation">180, 22</target>
</trans-unit>
<trans-unit id="Menu_Persist.Text" translate="yes" xml:space="preserve">
<source>Persist</source>
<target state="new">Persist</target>
</trans-unit>
<trans-unit id="Menu_Disconnect.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
<source>False</source>
<target state="needs-review-translation">False</target>
</trans-unit>
<trans-unit id="$this.ImeMode" translate="yes" xml:space="preserve" extype="System.Windows.Forms.ImeMode, System.Windows.Forms">
<source>NoControl</source>
<target state="needs-review-translation">NoControl</target>
</trans-unit>
<trans-unit id="Menu_UPS_Var.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
<source>False</source>
<target state="needs-review-translation">False</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
104 changes: 76 additions & 28 deletions WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,10 +1764,6 @@ Ini File Moved to {0}.old</source>
<source>Reconnection In Progress</source>
<target state="final">Wiederverbindung läuft</target>
</trans-unit>
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
<source>Try {0} of {1}</source>
<target state="translated">Versuch {0} von {1}</target>
</trans-unit>
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
<source>Not Connected</source>
<target state="final">Nicht verbunden</target>
Expand Down Expand Up @@ -1808,14 +1804,6 @@ Ini File Moved to {0}.old</source>
<source>Disconnected from Nut Host</source>
<target state="translated">Verbindung zum NUT-Host verloren</target>
</trans-unit>
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
<source>Try Reconnect {0} / {1}</source>
<target state="translated">Versuche Wiederverbindung {0} / {1}</target>
</trans-unit>
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
<source>Max Retry reached. Wait for manual Reconnection</source>
<target state="translated">Maximale Anzahl Verbindungsversuche erreicht. Auf manuelle Wiederverbindung warten.</target>
</trans-unit>
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
<source>Conditions met for launching the Extinguishing Process</source>
<target state="translated">Voraussetzungen für den Start des Löschprozesses liegen vor</target>
Expand Down Expand Up @@ -1953,6 +1941,18 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
<target state="new">Unavailable</target>
<note from="MultilingualBuild" annotates="source" priority="2">Indicate that a variable is unavailable</note>
</trans-unit>
<trans-unit id="RepeatHS" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
<source>..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
<target state="needs-review-translation">..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
</trans-unit>
<trans-unit id="disconnect2" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
<source>..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
<target state="needs-review-translation">..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
</trans-unit>
<trans-unit id="internetconnection" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
<source>..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
<target state="needs-review-translation">..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
</trans-unit>
</group>
</body>
</file>
Expand All @@ -1975,8 +1975,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
<target state="translated">USV-Variablen</target>
</trans-unit>
<trans-unit id="Menu_Quit.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>180, 22</source>
<target state="final">180, 22</target>
<source>177, 22</source>
<target state="final">177, 22</target>
</trans-unit>
<trans-unit id="Menu_Quit.Text" translate="yes" xml:space="preserve">
<source>Exit</source>
Expand All @@ -1990,17 +1990,9 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
<source>File</source>
<target state="final">Datei</target>
</trans-unit>
<trans-unit id="Menu_Reconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>133, 22</source>
<target state="final">133, 22</target>
</trans-unit>
<trans-unit id="Menu_Reconnect.Text" translate="yes" xml:space="preserve">
<source>Reconnect</source>
<target state="final">Erneut verbinden</target>
</trans-unit>
<trans-unit id="Menu_Disconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>133, 22</source>
<target state="final">133, 22</target>
<source>180, 22</source>
<target state="final">180, 22</target>
</trans-unit>
<trans-unit id="Menu_Disconnect.Text" translate="yes" xml:space="preserve">
<source>Disconnect</source>
Expand Down Expand Up @@ -2055,8 +2047,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
<target state="final">0, 0</target>
</trans-unit>
<trans-unit id="Main_Menu.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>351, 24</source>
<target state="final">351, 24</target>
<source>231, 24</source>
<target state="final">231, 24</target>
</trans-unit>
<trans-unit id="Main_Menu.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
<source>0</source>
Expand Down Expand Up @@ -3231,8 +3223,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
<target state="needs-review-translation">False</target>
</trans-unit>
<trans-unit id="ManageOldPrefsToolStripMenuItem.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
<source>180, 22</source>
<target state="new">180, 22</target>
<source>177, 22</source>
<target state="needs-review-translation">177, 22</target>
</trans-unit>
<trans-unit id="ManageOldPrefsToolStripMenuItem.Text" translate="yes" xml:space="preserve">
<source>Manage Old Prefs...</source>
Expand All @@ -3242,6 +3234,62 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
<source></source>
<target state="new"></target>
</trans-unit>
<trans-unit id="Menu_Connect.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
<source>180, 22</source>
<target state="needs-review-translation">180, 22</target>
</trans-unit>
<trans-unit id="Menu_Connect.Text" translate="yes" xml:space="preserve">
<source>Connect</source>
<target state="new">Connect</target>
</trans-unit>
<trans-unit id="AG_InV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_OutV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_BattCh.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_Load.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_BattV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="AG_InF.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
<source></source>
<target state="needs-review-translation"></target>
</trans-unit>
<trans-unit id="ToolStripSeparator1.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
<source>177, 6</source>
<target state="needs-review-translation">177, 6</target>
</trans-unit>
<trans-unit id="Menu_Persist.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
<source>180, 22</source>
<target state="needs-review-translation">180, 22</target>
</trans-unit>
<trans-unit id="Menu_Persist.Text" translate="yes" xml:space="preserve">
<source>Persist</source>
<target state="new">Persist</target>
</trans-unit>
<trans-unit id="Menu_Disconnect.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
<source>False</source>
<target state="needs-review-translation">False</target>
</trans-unit>
<trans-unit id="$this.ImeMode" translate="yes" xml:space="preserve" extype="System.Windows.Forms.ImeMode, System.Windows.Forms">
<source>NoControl</source>
<target state="needs-review-translation">NoControl</target>
</trans-unit>
<trans-unit id="Menu_UPS_Var.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
<source>False</source>
<target state="needs-review-translation">False</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
Loading
Loading