Skip to content

Commit 41bfcef

Browse files
gbakemangbakeman
committed
Merge branch 'dev-2.3' into 133-modify-update-routines
2 parents 9467238 + 9e9e5ec commit 41bfcef

37 files changed

+2286
-1470
lines changed

‎WinNUT_V2/Setup/Setup.vdproj‎

Lines changed: 204 additions & 204 deletions
Large diffs are not rendered by default.

‎WinNUT_V2/WinNUT-Client/ApplicationEvents.vb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
' This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY
99

1010
Imports System.Configuration
11+
Imports System.Deployment.Application
1112
Imports System.Globalization
1213
Imports System.IO
1314
Imports System.Text.RegularExpressions
@@ -42,6 +43,9 @@ Namespace My
4243
' AddHandler AppDomain.CurrentDomain.UnhandledException, AddressOf AppDomainUnhandledException
4344

4445
Init_Globals()
46+
LogFile.LogTracing(String.Format("{0} v{1} starting up.", My.Application.Info.ProductName, My.Application.Info.Version),
47+
LogLvl.LOG_NOTICE, Me)
48+
' LogFile.LogTracing($"DataDirectory: { ApplicationDeployment.CurrentDeployment.DataDirectory }", LogLvl.LOG_NOTICE, Me)
4549

4650
' If first run indicated by Settings, attempt upgrade in case older version is present.
4751
' Only necessary when deploying MSI. Remove once using pure ClickOnce.

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

Lines changed: 76 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,6 @@ Ini File Moved to {0}.old</source>
490490
<source>Reconnection In Progress</source>
491491
<target state="translated">正在重新連線</target>
492492
</trans-unit>
493-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
494-
<source>Try {0} of {1}</source>
495-
<target state="translated">重試第 {0} 次，共 {1} 次</target>
496-
</trans-unit>
497493
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
498494
<source>Not Connected</source>
499495
<target state="translated">未連線</target>
@@ -567,14 +563,6 @@ Remaining Time : {1}</source>
567563
<source>Disconnected from Nut Host</source>
568564
<target state="translated">已與 NUT 伺服器中斷連線。</target>
569565
</trans-unit>
570-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
571-
<source>Try Reconnect {0} / {1}</source>
572-
<target state="translated">重試連線 {0} / {1}</target>
573-
</trans-unit>
574-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
575-
<source>Max Retry reached. Wait for manual Reconnection</source>
576-
<target state="translated">已達最大重試次數，等待手動重新連線。</target>
577-
</trans-unit>
578566
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
579567
<source>Conditions met for launching the Extinguishing Process</source>
580568
<target state="translated">啟動停機程序的條件</target>
@@ -692,6 +680,18 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa
692680
<target state="new">Unavailable</target>
693681
<note from="MultilingualBuild" annotates="source" priority="2">Indicate that a variable is unavailable</note>
694682
</trans-unit>
683+
<trans-unit id="RepeatHS" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
684+
<source>..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
685+
<target state="needs-review-translation">..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
686+
</trans-unit>
687+
<trans-unit id="disconnect2" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
688+
<source>..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
689+
<target state="needs-review-translation">..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
690+
</trans-unit>
691+
<trans-unit id="internetconnection" translate="yes" xml:space="preserve" extype="System.Resources.ResXFileRef, System.Windows.Forms">
692+
<source>..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
693+
<target state="needs-review-translation">..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
694+
</trans-unit>
695695
<trans-unit id="LogCheckingForUpdate" translate="yes" xml:space="preserve">
696696
<source>Checking for update...</source>
697697
<target state="new">Checking for update...</target>
@@ -2368,8 +2368,8 @@ Accepted value: Numeric value from 0 to 100.</source>
23682368
<target state="translated">UPS 變數</target>
23692369
</trans-unit>
23702370
<trans-unit id="Menu_Quit.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2371-
<source>180, 22</source>
2372-
<target state="final">180, 22</target>
2371+
<source>177, 22</source>
2372+
<target state="final">177, 22</target>
23732373
</trans-unit>
23742374
<trans-unit id="Menu_Quit.Text" translate="yes" xml:space="preserve">
23752375
<source>Exit</source>
@@ -2383,17 +2383,9 @@ Accepted value: Numeric value from 0 to 100.</source>
23832383
<source>File</source>
23842384
<target state="translated">檔案</target>
23852385
</trans-unit>
2386-
<trans-unit id="Menu_Reconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2387-
<source>133, 22</source>
2388-
<target state="final">133, 22</target>
2389-
</trans-unit>
2390-
<trans-unit id="Menu_Reconnect.Text" translate="yes" xml:space="preserve">
2391-
<source>Reconnect</source>
2392-
<target state="translated">重新連線</target>
2393-
</trans-unit>
23942386
<trans-unit id="Menu_Disconnect.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2395-
<source>133, 22</source>
2396-
<target state="final">133, 22</target>
2387+
<source>180, 22</source>
2388+
<target state="final">180, 22</target>
23972389
</trans-unit>
23982390
<trans-unit id="Menu_Disconnect.Text" translate="yes" xml:space="preserve">
23992391
<source>Disconnect</source>
@@ -2452,8 +2444,8 @@ Accepted value: Numeric value from 0 to 100.</source>
24522444
<target state="final">0, 24</target>
24532445
</trans-unit>
24542446
<trans-unit id="Main_Menu.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2455-
<source>351, 24</source>
2456-
<target state="final">351, 24</target>
2447+
<source>231, 24</source>
2448+
<target state="final">231, 24</target>
24572449
</trans-unit>
24582450
<trans-unit id="Main_Menu.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
24592451
<source>0</source>
@@ -3564,8 +3556,8 @@ Accepted value: Numeric value from 0 to 100.</source>
35643556
<target state="needs-review-translation">False</target>
35653557
</trans-unit>
35663558
<trans-unit id="ManageOldPrefsToolStripMenuItem.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
3567-
<source>180, 22</source>
3568-
<target state="new">180, 22</target>
3559+
<source>177, 22</source>
3560+
<target state="needs-review-translation">177, 22</target>
35693561
</trans-unit>
35703562
<trans-unit id="ManageOldPrefsToolStripMenuItem.Text" translate="yes" xml:space="preserve">
35713563
<source>Manage Old Prefs...</source>
@@ -3575,6 +3567,62 @@ Accepted value: Numeric value from 0 to 100.</source>
35753567
<source></source>
35763568
<target state="new"></target>
35773569
</trans-unit>
3570+
<trans-unit id="Menu_Connect.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3571+
<source>180, 22</source>
3572+
<target state="needs-review-translation">180, 22</target>
3573+
</trans-unit>
3574+
<trans-unit id="Menu_Connect.Text" translate="yes" xml:space="preserve">
3575+
<source>Connect</source>
3576+
<target state="new">Connect</target>
3577+
</trans-unit>
3578+
<trans-unit id="AG_InV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3579+
<source></source>
3580+
<target state="needs-review-translation"></target>
3581+
</trans-unit>
3582+
<trans-unit id="AG_OutV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3583+
<source></source>
3584+
<target state="needs-review-translation"></target>
3585+
</trans-unit>
3586+
<trans-unit id="AG_BattCh.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3587+
<source></source>
3588+
<target state="needs-review-translation"></target>
3589+
</trans-unit>
3590+
<trans-unit id="AG_Load.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3591+
<source></source>
3592+
<target state="needs-review-translation"></target>
3593+
</trans-unit>
3594+
<trans-unit id="AG_BattV.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3595+
<source></source>
3596+
<target state="needs-review-translation"></target>
3597+
</trans-unit>
3598+
<trans-unit id="AG_InF.Text" translate="yes" xml:space="preserve" extype="System.Resources.ResXNullRef, System.Windows.Forms">
3599+
<source></source>
3600+
<target state="needs-review-translation"></target>
3601+
</trans-unit>
3602+
<trans-unit id="ToolStripSeparator1.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3603+
<source>177, 6</source>
3604+
<target state="needs-review-translation">177, 6</target>
3605+
</trans-unit>
3606+
<trans-unit id="Menu_Persist.Size" translate="yes" xml:space="preserve" extype="System.Drawing.Size, System.Drawing">
3607+
<source>180, 22</source>
3608+
<target state="needs-review-translation">180, 22</target>
3609+
</trans-unit>
3610+
<trans-unit id="Menu_Persist.Text" translate="yes" xml:space="preserve">
3611+
<source>Persist</source>
3612+
<target state="new">Persist</target>
3613+
</trans-unit>
3614+
<trans-unit id="Menu_Disconnect.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3615+
<source>False</source>
3616+
<target state="needs-review-translation">False</target>
3617+
</trans-unit>
3618+
<trans-unit id="$this.ImeMode" translate="yes" xml:space="preserve" extype="System.Windows.Forms.ImeMode, System.Windows.Forms">
3619+
<source>NoControl</source>
3620+
<target state="needs-review-translation">NoControl</target>
3621+
</trans-unit>
3622+
<trans-unit id="Menu_UPS_Var.Enabled" translate="yes" xml:space="preserve" extype="System.Boolean, mscorlib">
3623+
<source>False</source>
3624+
<target state="needs-review-translation">False</target>
3625+
</trans-unit>
35783626
</group>
35793627
</body>
35803628
</file>

0 commit comments

Comments
 (0)