Skip to content

Commit b722db2

Browse files
gbakemangbakeman
authored
Merge pull request #171 from nutdotnet/65-persist-conn
Persistent Connection attempts, quieter notifications
2 parents 218f45a + 886613f commit b722db2

29 files changed

+2057
-1205
lines changed

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

Lines changed: 76 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,6 @@ Ini File Moved to {0}.old</source>
635635
<source>Reconnection In Progress</source>
636636
<target state="translated">正在重新連線</target>
637637
</trans-unit>
638-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
639-
<source>Try {0} of {1}</source>
640-
<target state="translated">重試第 {0} 次，共 {1} 次</target>
641-
</trans-unit>
642638
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
643639
<source>Not Connected</source>
644640
<target state="translated">未連線</target>
@@ -734,14 +730,6 @@ Cancel to Save Msi and Install Later</source>
734730
<source>Disconnected from Nut Host</source>
735731
<target state="translated">已與 NUT 伺服器中斷連線。</target>
736732
</trans-unit>
737-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
738-
<source>Try Reconnect {0} / {1}</source>
739-
<target state="translated">重試連線 {0} / {1}</target>
740-
</trans-unit>
741-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
742-
<source>Max Retry reached. Wait for manual Reconnection</source>
743-
<target state="translated">已達最大重試次數，等待手動重新連線。</target>
744-
</trans-unit>
745733
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
746734
<source>Conditions met for launching the Extinguishing Process</source>
747735
<target state="translated">啟動停機程序的條件</target>
@@ -859,6 +847,18 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
859847
<target state="new">Unavailable</target>
860848
<note from="MultilingualBuild" annotates="source" priority="2">Indicate that a variable is unavailable</note>
861849
</trans-unit>
850+
<trans-unit id="RepeatHS" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
851+
<source>..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
852+
<target state="needs-review-translation">..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
853+
</trans-unit>
854+
<trans-unit id="disconnect2" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
855+
<source>..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
856+
<target state="needs-review-translation">..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
857+
</trans-unit>
858+
<trans-unit id="internetconnection" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
859+
<source>..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
860+
<target state="needs-review-translation">..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
861+
</trans-unit>
862862
</group>
863863
</body>
864864
</file>
@@ -2562,8 +2562,8 @@ Accepted value: Numeric value from 0 to 100.</source>
25622562
<target state="translated">UPS 變數</target>
25632563
</trans-unit>
25642564
<trans-unit id="Menu_Quit.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2565-
<source>180, 22</source>
2566-
<target state="final">180, 22</target>
2565+
<source>177, 22</source>
2566+
<target state="final">177, 22</target>
25672567
</trans-unit>
25682568
<trans-unit id="Menu_Quit.Text" translate="yes" xml:space="preserve">
25692569
<source>Exit</source>
@@ -2577,17 +2577,9 @@ Accepted value: Numeric value from 0 to 100.</source>
25772577
<source>File</source>
25782578
<target state="translated">檔案</target>
25792579
</trans-unit>
2580-
<trans-unit id="Menu_Reconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2581-
<source>133, 22</source>
2582-
<target state="final">133, 22</target>
2583-
</trans-unit>
2584-
<trans-unit id="Menu_Reconnect.Text" translate="yes" xml:space="preserve">
2585-
<source>Reconnect</source>
2586-
<target state="translated">重新連線</target>
2587-
</trans-unit>
25882580
<trans-unit id="Menu_Disconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2589-
<source>133, 22</source>
2590-
<target state="final">133, 22</target>
2581+
<source>180, 22</source>
2582+
<target state="final">180, 22</target>
25912583
</trans-unit>
25922584
<trans-unit id="Menu_Disconnect.Text" translate="yes" xml:space="preserve">
25932585
<source>Disconnect</source>
@@ -2646,8 +2638,8 @@ Accepted value: Numeric value from 0 to 100.</source>
26462638
<target state="final">0, 24</target>
26472639
</trans-unit>
26482640
<trans-unit id="Main_Menu.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2649-
<source>351, 24</source>
2650-
<target state="final">351, 24</target>
2641+
<source>231, 24</source>
2642+
<target state="final">231, 24</target>
26512643
</trans-unit>
26522644
<trans-unit id="Main_Menu.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
26532645
<source>0</source>
@@ -3758,8 +3750,8 @@ Accepted value: Numeric value from 0 to 100.</source>
37583750
<target state="needs-review-translation">False</target>
37593751
</trans-unit>
37603752
<trans-unit id="ManageOldPrefsToolStripMenuItem.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
3761-
<source>180, 22</source>
3762-
<target state="new">180, 22</target>
3753+
<source>177, 22</source>
3754+
<target state="needs-review-translation">177, 22</target>
37633755
</trans-unit>
37643756
<trans-unit id="ManageOldPrefsToolStripMenuItem.Text" translate="yes" xml:space="preserve">
37653757
<source>Manage Old Prefs...</source>
@@ -3769,6 +3761,62 @@ Accepted value: Numeric value from 0 to 100.</source>
37693761
<source></source>
37703762
<target state="new"></target>
37713763
</trans-unit>
3764+
<trans-unit id="Menu_Connect.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3765+
<source>180, 22</source>
3766+
<target state="needs-review-translation">180, 22</target>
3767+
</trans-unit>
3768+
<trans-unit id="Menu_Connect.Text" translate="yes" xml:space="preserve">
3769+
<source>Connect</source>
3770+
<target state="new">Connect</target>
3771+
</trans-unit>
3772+
<trans-unit id="AG_InV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3773+
<source></source>
3774+
<target state="needs-review-translation"></target>
3775+
</trans-unit>
3776+
<trans-unit id="AG_OutV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3777+
<source></source>
3778+
<target state="needs-review-translation"></target>
3779+
</trans-unit>
3780+
<trans-unit id="AG_BattCh.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3781+
<source></source>
3782+
<target state="needs-review-translation"></target>
3783+
</trans-unit>
3784+
<trans-unit id="AG_Load.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3785+
<source></source>
3786+
<target state="needs-review-translation"></target>
3787+
</trans-unit>
3788+
<trans-unit id="AG_BattV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3789+
<source></source>
3790+
<target state="needs-review-translation"></target>
3791+
</trans-unit>
3792+
<trans-unit id="AG_InF.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3793+
<source></source>
3794+
<target state="needs-review-translation"></target>
3795+
</trans-unit>
3796+
<trans-unit id="ToolStripSeparator1.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3797+
<source>177, 6</source>
3798+
<target state="needs-review-translation">177, 6</target>
3799+
</trans-unit>
3800+
<trans-unit id="Menu_Persist.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3801+
<source>180, 22</source>
3802+
<target state="needs-review-translation">180, 22</target>
3803+
</trans-unit>
3804+
<trans-unit id="Menu_Persist.Text" translate="yes" xml:space="preserve">
3805+
<source>Persist</source>
3806+
<target state="new">Persist</target>
3807+
</trans-unit>
3808+
<trans-unit id="Menu_Disconnect.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3809+
<source>False</source>
3810+
<target state="needs-review-translation">False</target>
3811+
</trans-unit>
3812+
<trans-unit id="$this.ImeMode" translate="yes" xml:space="preserve" extype="System.Windows.Forms.ImeMode, System.Windows.Forms">
3813+
<source>NoControl</source>
3814+
<target state="needs-review-translation">NoControl</target>
3815+
</trans-unit>
3816+
<trans-unit id="Menu_UPS_Var.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3817+
<source>False</source>
3818+
<target state="needs-review-translation">False</target>
3819+
</trans-unit>
37723820
</group>
37733821
</body>
37743822
</file>

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

Lines changed: 76 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,10 +1764,6 @@ Ini File Moved to {0}.old</source>
17641764
<source>Reconnection In Progress</source>
17651765
<target state="final">Wiederverbindung läuft</target>
17661766
</trans-unit>
1767-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
1768-
<source>Try {0} of {1}</source>
1769-
<target state="translated">Versuch {0} von {1}</target>
1770-
</trans-unit>
17711767
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
17721768
<source>Not Connected</source>
17731769
<target state="final">Nicht verbunden</target>
@@ -1808,14 +1804,6 @@ Ini File Moved to {0}.old</source>
18081804
<source>Disconnected from Nut Host</source>
18091805
<target state="translated">Verbindung zum NUT-Host verloren</target>
18101806
</trans-unit>
1811-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
1812-
<source>Try Reconnect {0} / {1}</source>
1813-
<target state="translated">Versuche Wiederverbindung {0} / {1}</target>
1814-
</trans-unit>
1815-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
1816-
<source>Max Retry reached. Wait for manual Reconnection</source>
1817-
<target state="translated">Maximale Anzahl Verbindungsversuche erreicht. Auf manuelle Wiederverbindung warten.</target>
1818-
</trans-unit>
18191807
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
18201808
<source>Conditions met for launching the Extinguishing Process</source>
18211809
<target state="translated">Voraussetzungen für den Start des Löschprozesses liegen vor</target>
@@ -1953,6 +1941,18 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
19531941
<target state="new">Unavailable</target>
19541942
<note from="MultilingualBuild" annotates="source" priority="2">Indicate that a variable is unavailable</note>
19551943
</trans-unit>
1944+
<trans-unit id="RepeatHS" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
1945+
<source>..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
1946+
<target state="needs-review-translation">..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
1947+
</trans-unit>
1948+
<trans-unit id="disconnect2" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
1949+
<source>..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
1950+
<target state="needs-review-translation">..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
1951+
</trans-unit>
1952+
<trans-unit id="internetconnection" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
1953+
<source>..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
1954+
<target state="needs-review-translation">..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
1955+
</trans-unit>
19561956
</group>
19571957
</body>
19581958
</file>
@@ -1975,8 +1975,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
19751975
<target state="translated">USV-Variablen</target>
19761976
</trans-unit>
19771977
<trans-unit id="Menu_Quit.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
1978-
<source>180, 22</source>
1979-
<target state="final">180, 22</target>
1978+
<source>177, 22</source>
1979+
<target state="final">177, 22</target>
19801980
</trans-unit>
19811981
<trans-unit id="Menu_Quit.Text" translate="yes" xml:space="preserve">
19821982
<source>Exit</source>
@@ -1990,17 +1990,9 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
19901990
<source>File</source>
19911991
<target state="final">Datei</target>
19921992
</trans-unit>
1993-
<trans-unit id="Menu_Reconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
1994-
<source>133, 22</source>
1995-
<target state="final">133, 22</target>
1996-
</trans-unit>
1997-
<trans-unit id="Menu_Reconnect.Text" translate="yes" xml:space="preserve">
1998-
<source>Reconnect</source>
1999-
<target state="final">Erneut verbinden</target>
2000-
</trans-unit>
20011993
<trans-unit id="Menu_Disconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2002-
<source>133, 22</source>
2003-
<target state="final">133, 22</target>
1994+
<source>180, 22</source>
1995+
<target state="final">180, 22</target>
20041996
</trans-unit>
20051997
<trans-unit id="Menu_Disconnect.Text" translate="yes" xml:space="preserve">
20061998
<source>Disconnect</source>
@@ -2055,8 +2047,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
20552047
<target state="final">0, 0</target>
20562048
</trans-unit>
20572049
<trans-unit id="Main_Menu.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2058-
<source>351, 24</source>
2059-
<target state="final">351, 24</target>
2050+
<source>231, 24</source>
2051+
<target state="final">231, 24</target>
20602052
</trans-unit>
20612053
<trans-unit id="Main_Menu.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
20622054
<source>0</source>
@@ -3231,8 +3223,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
32313223
<target state="needs-review-translation">False</target>
32323224
</trans-unit>
32333225
<trans-unit id="ManageOldPrefsToolStripMenuItem.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
3234-
<source>180, 22</source>
3235-
<target state="new">180, 22</target>
3226+
<source>177, 22</source>
3227+
<target state="needs-review-translation">177, 22</target>
32363228
</trans-unit>
32373229
<trans-unit id="ManageOldPrefsToolStripMenuItem.Text" translate="yes" xml:space="preserve">
32383230
<source>Manage Old Prefs...</source>
@@ -3242,6 +3234,62 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
32423234
<source></source>
32433235
<target state="new"></target>
32443236
</trans-unit>
3237+
<trans-unit id="Menu_Connect.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3238+
<source>180, 22</source>
3239+
<target state="needs-review-translation">180, 22</target>
3240+
</trans-unit>
3241+
<trans-unit id="Menu_Connect.Text" translate="yes" xml:space="preserve">
3242+
<source>Connect</source>
3243+
<target state="new">Connect</target>
3244+
</trans-unit>
3245+
<trans-unit id="AG_InV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3246+
<source></source>
3247+
<target state="needs-review-translation"></target>
3248+
</trans-unit>
3249+
<trans-unit id="AG_OutV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3250+
<source></source>
3251+
<target state="needs-review-translation"></target>
3252+
</trans-unit>
3253+
<trans-unit id="AG_BattCh.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3254+
<source></source>
3255+
<target state="needs-review-translation"></target>
3256+
</trans-unit>
3257+
<trans-unit id="AG_Load.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3258+
<source></source>
3259+
<target state="needs-review-translation"></target>
3260+
</trans-unit>
3261+
<trans-unit id="AG_BattV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3262+
<source></source>
3263+
<target state="needs-review-translation"></target>
3264+
</trans-unit>
3265+
<trans-unit id="AG_InF.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3266+
<source></source>
3267+
<target state="needs-review-translation"></target>
3268+
</trans-unit>
3269+
<trans-unit id="ToolStripSeparator1.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3270+
<source>177, 6</source>
3271+
<target state="needs-review-translation">177, 6</target>
3272+
</trans-unit>
3273+
<trans-unit id="Menu_Persist.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3274+
<source>180, 22</source>
3275+
<target state="needs-review-translation">180, 22</target>
3276+
</trans-unit>
3277+
<trans-unit id="Menu_Persist.Text" translate="yes" xml:space="preserve">
3278+
<source>Persist</source>
3279+
<target state="new">Persist</target>
3280+
</trans-unit>
3281+
<trans-unit id="Menu_Disconnect.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3282+
<source>False</source>
3283+
<target state="needs-review-translation">False</target>
3284+
</trans-unit>
3285+
<trans-unit id="$this.ImeMode" translate="yes" xml:space="preserve" extype="System.Windows.Forms.ImeMode, System.Windows.Forms">
3286+
<source>NoControl</source>
3287+
<target state="needs-review-translation">NoControl</target>
3288+
</trans-unit>
3289+
<trans-unit id="Menu_UPS_Var.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3290+
<source>False</source>
3291+
<target state="needs-review-translation">False</target>
3292+
</trans-unit>
32453293
</group>
32463294
</body>
32473295
</file>

0 commit comments

Comments
 (0)