Skip to content

Commit c07fabc

Browse files
gbakemangbakeman
authored
Merge pull request #164 from nutdotnet/153-poll-int
Revert Polling Interval display to seconds
2 parents 8c5c8c0 + 33aa9fb commit c07fabc

14 files changed

+1214
-367
lines changed

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

+46-20
Original file line numberDiff line numberDiff line change
@@ -778,9 +778,9 @@ Cancel to Save Msi and Install Later</source>
778778
<source>..\Resources\WinNUT-Updater.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
779779
<target state="final">..\Resources\WinNUT-Updater.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
780780
</trans-unit>
781-
<trans-unit id="XP_Information" translate="yes" extype="System.Resources.ResXFileRef, System.Windows.Forms" xml:space="preserve">
781+
<trans-unit id="XP_Information" translate="no" extype="System.Resources.ResXFileRef, System.Windows.Forms" xml:space="preserve">
782782
<source>..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
783-
<target state="needs-review-translation">..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
783+
<target state="final">..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
784784
</trans-unit>
785785
<trans-unit id="DetectedPreviousPrefsData" translate="yes" xml:space="preserve">
786786
<source>Previous preferences data detected in the Registry.</source>
@@ -1488,10 +1488,6 @@ Accepted value: Numeric value from 0 to 100.</source>
14881488
<source>Calibration</source>
14891489
<target state="translated">校正</target>
14901490
</trans-unit>
1491-
<trans-unit id="Tb_Delay_Com.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
1492-
<source>12</source>
1493-
<target state="final">12</target>
1494-
</trans-unit>
14951491
<trans-unit id="Lbl_LoadUPS.Text" translate="yes" xml:space="preserve">
14961492
<source>UPS Load</source>
14971493
<target state="translated">UPS 負載</target>
@@ -1756,12 +1752,6 @@ Accepted value: Numeric value from 0 to 100.</source>
17561752
<source>Debug</source>
17571753
<target state="translated">除錯</target>
17581754
</trans-unit>
1759-
<trans-unit id="Tb_Delay_Com.ToolTip" translate="yes" xml:space="preserve">
1760-
<source>Milliseconds between data updates from NUT server.
1761-
Min: 100, Max: 60 000.</source>
1762-
<target state="new">Milliseconds between data updates from NUT server.
1763-
Min: 100, Max: 60 000.</target>
1764-
</trans-unit>
17651755
<trans-unit id="Label3.ImeMode" translate="no" extype="System.Windows.Forms.ImeMode, System.Windows.Forms" xml:space="preserve">
17661756
<source>NoControl</source>
17671757
<target state="final">NoControl</target>
@@ -1880,10 +1870,6 @@ Accepted value: Numeric value from 0 to 3600.</source>
18801870
<source>92, 13</source>
18811871
<target state="final">92, 13</target>
18821872
</trans-unit>
1883-
<trans-unit id="Tb_Delay_Com.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
1884-
<source>154, 101</source>
1885-
<target state="final">154, 101</target>
1886-
</trans-unit>
18871873
<trans-unit id="Tab_Update.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
18881874
<source>4, 22</source>
18891875
<target state="final">4, 22</target>
@@ -2020,10 +2006,6 @@ Accepted value: Numeric value from 0 to 3600.</source>
20202006
<source>154, 11</source>
20212007
<target state="final">154, 11</target>
20222008
</trans-unit>
2023-
<trans-unit id="Tb_Delay_Com.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2024-
<source>162, 20</source>
2025-
<target state="final">162, 20</target>
2026-
</trans-unit>
20272009
<trans-unit id="CB_Close_Tray.Text" translate="yes" xml:space="preserve">
20282010
<source>Close to Systray</source>
20292011
<target state="translated">關閉至系統匣</target>
@@ -2454,6 +2436,50 @@ Accepted value: Numeric value from 0 to 100.</source>
24542436
<source>Microsoft Sans Serif, 8.25pt, style=Italic</source>
24552437
<target state="needs-review-translation">Microsoft Sans Serif, 8.25pt, style=Italic</target>
24562438
</trans-unit>
2439+
<trans-unit id="pollingIntervalUnitLabel.Anchor" translate="yes" extype="System.Windows.Forms.AnchorStyles, System.Windows.Forms" xml:space="preserve">
2440+
<source>Right</source>
2441+
<target state="needs-review-translation">Right</target>
2442+
</trans-unit>
2443+
<trans-unit id="pollingIntervalUnitLabel.AutoSize" translate="yes" extype="System.Boolean, mscorlib" xml:space="preserve">
2444+
<source>True</source>
2445+
<target state="needs-review-translation">True</target>
2446+
</trans-unit>
2447+
<trans-unit id="pollingIntervalUnitLabel.Location" translate="yes" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
2448+
<source>251, 102</source>
2449+
<target state="needs-review-translation">251, 102</target>
2450+
</trans-unit>
2451+
<trans-unit id="pollingIntervalUnitLabel.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2452+
<source>49, 13</source>
2453+
<target state="needs-review-translation">49, 13</target>
2454+
</trans-unit>
2455+
<trans-unit id="pollingIntervalUnitLabel.TabIndex" translate="yes" extype="System.Int32, mscorlib" xml:space="preserve">
2456+
<source>20</source>
2457+
<target state="needs-review-translation">20</target>
2458+
</trans-unit>
2459+
<trans-unit id="pollingIntervalUnitLabel.Text" translate="yes" xml:space="preserve">
2460+
<source>Seconds</source>
2461+
<target state="new">Seconds</target>
2462+
</trans-unit>
2463+
<trans-unit id="pollingIntervalValue.Location" translate="yes" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
2464+
<source>154, 100</source>
2465+
<target state="needs-review-translation">154, 100</target>
2466+
</trans-unit>
2467+
<trans-unit id="pollingIntervalValue.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
2468+
<source>91, 20</source>
2469+
<target state="needs-review-translation">91, 20</target>
2470+
</trans-unit>
2471+
<trans-unit id="pollingIntervalValue.TabIndex" translate="yes" extype="System.Int32, mscorlib" xml:space="preserve">
2472+
<source>19</source>
2473+
<target state="needs-review-translation">19</target>
2474+
</trans-unit>
2475+
<trans-unit id="pollingIntervalValue.ToolTip" translate="yes" xml:space="preserve">
2476+
<source>How often WinNUT refreshes data from the NUT server.</source>
2477+
<target state="new">How often WinNUT refreshes data from the NUT server.</target>
2478+
</trans-unit>
2479+
<trans-unit id="Btn_Apply.Enabled" translate="yes" extype="System.Boolean, mscorlib" xml:space="preserve">
2480+
<source>False</source>
2481+
<target state="needs-review-translation">False</target>
2482+
</trans-unit>
24572483
</group>
24582484
</body>
24592485
</file>

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

+46-20
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@
66
</header>
77
<body>
88
<group id="WINNUT-CLIENT/PREF_GUI.RESX" datatype="resx">
9-
<trans-unit id="Tb_Delay_Com.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
10-
<source>154, 101</source>
11-
<target state="final">154, 101</target>
12-
</trans-unit>
13-
<trans-unit id="Tb_Delay_Com.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
14-
<source>162, 20</source>
15-
<target state="final">162, 20</target>
16-
</trans-unit>
17-
<trans-unit id="Tb_Delay_Com.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
18-
<source>12</source>
19-
<target state="final">12</target>
20-
</trans-unit>
219
<trans-unit id="Tb_UPS_Name.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
2210
<source>154, 71</source>
2311
<target state="final">154, 71</target>
@@ -1234,12 +1222,6 @@
12341222
<source>17, 17</source>
12351223
<target state="final">17, 17</target>
12361224
</trans-unit>
1237-
<trans-unit id="Tb_Delay_Com.ToolTip" translate="yes" xml:space="preserve">
1238-
<source>Milliseconds between data updates from NUT server.
1239-
Min: 100, Max: 60 000.</source>
1240-
<target state="new">Milliseconds between data updates from NUT server.
1241-
Min: 100, Max: 60 000.</target>
1242-
</trans-unit>
12431225
<trans-unit id="Tb_UPS_Name.ToolTip" translate="yes" xml:space="preserve">
12441226
<source>UPS name to monitor.
12451227
Accepted Value: Name of the UPS configured in the Nut server.</source>
@@ -1557,6 +1539,50 @@ Accepted value: Numeric value from 0 to 100.</source>
15571539
<source>Microsoft Sans Serif, 8.25pt, style=Italic</source>
15581540
<target state="needs-review-translation">Microsoft Sans Serif, 8.25pt, style=Italic</target>
15591541
</trans-unit>
1542+
<trans-unit id="pollingIntervalUnitLabel.Anchor" translate="yes" extype="System.Windows.Forms.AnchorStyles, System.Windows.Forms" xml:space="preserve">
1543+
<source>Right</source>
1544+
<target state="needs-review-translation">Right</target>
1545+
</trans-unit>
1546+
<trans-unit id="pollingIntervalUnitLabel.AutoSize" translate="yes" extype="System.Boolean, mscorlib" xml:space="preserve">
1547+
<source>True</source>
1548+
<target state="needs-review-translation">True</target>
1549+
</trans-unit>
1550+
<trans-unit id="pollingIntervalUnitLabel.Location" translate="yes" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
1551+
<source>251, 102</source>
1552+
<target state="needs-review-translation">251, 102</target>
1553+
</trans-unit>
1554+
<trans-unit id="pollingIntervalUnitLabel.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
1555+
<source>49, 13</source>
1556+
<target state="needs-review-translation">49, 13</target>
1557+
</trans-unit>
1558+
<trans-unit id="pollingIntervalUnitLabel.TabIndex" translate="yes" extype="System.Int32, mscorlib" xml:space="preserve">
1559+
<source>20</source>
1560+
<target state="needs-review-translation">20</target>
1561+
</trans-unit>
1562+
<trans-unit id="pollingIntervalUnitLabel.Text" translate="yes" xml:space="preserve">
1563+
<source>Seconds</source>
1564+
<target state="new">Seconds</target>
1565+
</trans-unit>
1566+
<trans-unit id="pollingIntervalValue.Location" translate="yes" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
1567+
<source>154, 100</source>
1568+
<target state="needs-review-translation">154, 100</target>
1569+
</trans-unit>
1570+
<trans-unit id="pollingIntervalValue.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
1571+
<source>91, 20</source>
1572+
<target state="needs-review-translation">91, 20</target>
1573+
</trans-unit>
1574+
<trans-unit id="pollingIntervalValue.TabIndex" translate="yes" extype="System.Int32, mscorlib" xml:space="preserve">
1575+
<source>19</source>
1576+
<target state="needs-review-translation">19</target>
1577+
</trans-unit>
1578+
<trans-unit id="pollingIntervalValue.ToolTip" translate="yes" xml:space="preserve">
1579+
<source>How often WinNUT refreshes data from the NUT server.</source>
1580+
<target state="new">How often WinNUT refreshes data from the NUT server.</target>
1581+
</trans-unit>
1582+
<trans-unit id="Btn_Apply.Enabled" translate="yes" extype="System.Boolean, mscorlib" xml:space="preserve">
1583+
<source>False</source>
1584+
<target state="needs-review-translation">False</target>
1585+
</trans-unit>
15601586
</group>
15611587
</body>
15621588
</file>
@@ -1846,9 +1872,9 @@ Ini File Moved to {0}.old</source>
18461872
<source>Windows standby. WinNUT will disconnect.</source>
18471873
<target state="final">Windows Standby. WinNUT wird getrennt. </target>
18481874
</trans-unit>
1849-
<trans-unit id="XP_Information" translate="yes" extype="System.Resources.ResXFileRef, System.Windows.Forms" xml:space="preserve">
1875+
<trans-unit id="XP_Information" translate="no" extype="System.Resources.ResXFileRef, System.Windows.Forms" xml:space="preserve">
18501876
<source>..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
1851-
<target state="needs-review-translation">..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
1877+
<target state="final">..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
18521878
</trans-unit>
18531879
<trans-unit id="DetectedPreviousPrefsData" translate="yes" xml:space="preserve">
18541880
<source>Previous preferences data detected in the Registry.</source>

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf

+46-20
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@
66
</header>
77
<body>
88
<group id="WINNUT-CLIENT/PREF_GUI.RESX" datatype="resx">
9-
<trans-unit id="Tb_Delay_Com.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
10-
<source>154, 101</source>
11-
<target state="final">154, 101</target>
12-
</trans-unit>
13-
<trans-unit id="Tb_Delay_Com.Size" translate="no" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
14-
<source>162, 20</source>
15-
<target state="final">162, 20</target>
16-
</trans-unit>
17-
<trans-unit id="Tb_Delay_Com.TabIndex" translate="no" extype="System.Int32, mscorlib" xml:space="preserve">
18-
<source>12</source>
19-
<target state="final">12</target>
20-
</trans-unit>
219
<trans-unit id="Tb_UPS_Name.Location" translate="no" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
2210
<source>154, 71</source>
2311
<target state="final">154, 71</target>
@@ -1237,12 +1225,6 @@ inférieur à</target>
12371225
<source>17, 17</source>
12381226
<target state="final">17, 17</target>
12391227
</trans-unit>
1240-
<trans-unit id="Tb_Delay_Com.ToolTip" translate="yes" xml:space="preserve">
1241-
<source>Milliseconds between data updates from NUT server.
1242-
Min: 100, Max: 60 000.</source>
1243-
<target state="new">Milliseconds between data updates from NUT server.
1244-
Min: 100, Max: 60 000.</target>
1245-
</trans-unit>
12461228
<trans-unit id="Tb_UPS_Name.ToolTip" translate="yes" xml:space="preserve">
12471229
<source>UPS name to monitor.
12481230
Accepted Value: Name of the UPS configured in the Nut server.</source>
@@ -1577,6 +1559,50 @@ Valeur acceptée: valeur numérique de 0 à 100.</target>
15771559
<source>Microsoft Sans Serif, 8.25pt, style=Italic</source>
15781560
<target state="needs-review-translation">Microsoft Sans Serif, 8.25pt, style=Italic</target>
15791561
</trans-unit>
1562+
<trans-unit id="pollingIntervalUnitLabel.Anchor" translate="yes" extype="System.Windows.Forms.AnchorStyles, System.Windows.Forms" xml:space="preserve">
1563+
<source>Right</source>
1564+
<target state="needs-review-translation">Right</target>
1565+
</trans-unit>
1566+
<trans-unit id="pollingIntervalUnitLabel.AutoSize" translate="yes" extype="System.Boolean, mscorlib" xml:space="preserve">
1567+
<source>True</source>
1568+
<target state="needs-review-translation">True</target>
1569+
</trans-unit>
1570+
<trans-unit id="pollingIntervalUnitLabel.Location" translate="yes" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
1571+
<source>251, 102</source>
1572+
<target state="needs-review-translation">251, 102</target>
1573+
</trans-unit>
1574+
<trans-unit id="pollingIntervalUnitLabel.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
1575+
<source>49, 13</source>
1576+
<target state="needs-review-translation">49, 13</target>
1577+
</trans-unit>
1578+
<trans-unit id="pollingIntervalUnitLabel.TabIndex" translate="yes" extype="System.Int32, mscorlib" xml:space="preserve">
1579+
<source>20</source>
1580+
<target state="needs-review-translation">20</target>
1581+
</trans-unit>
1582+
<trans-unit id="pollingIntervalUnitLabel.Text" translate="yes" xml:space="preserve">
1583+
<source>Seconds</source>
1584+
<target state="new">Seconds</target>
1585+
</trans-unit>
1586+
<trans-unit id="pollingIntervalValue.Location" translate="yes" extype="System.Drawing.Point, System.Drawing" xml:space="preserve">
1587+
<source>154, 100</source>
1588+
<target state="needs-review-translation">154, 100</target>
1589+
</trans-unit>
1590+
<trans-unit id="pollingIntervalValue.Size" translate="yes" extype="System.Drawing.Size, System.Drawing" xml:space="preserve">
1591+
<source>91, 20</source>
1592+
<target state="needs-review-translation">91, 20</target>
1593+
</trans-unit>
1594+
<trans-unit id="pollingIntervalValue.TabIndex" translate="yes" extype="System.Int32, mscorlib" xml:space="preserve">
1595+
<source>19</source>
1596+
<target state="needs-review-translation">19</target>
1597+
</trans-unit>
1598+
<trans-unit id="pollingIntervalValue.ToolTip" translate="yes" xml:space="preserve">
1599+
<source>How often WinNUT refreshes data from the NUT server.</source>
1600+
<target state="new">How often WinNUT refreshes data from the NUT server.</target>
1601+
</trans-unit>
1602+
<trans-unit id="Btn_Apply.Enabled" translate="yes" extype="System.Boolean, mscorlib" xml:space="preserve">
1603+
<source>False</source>
1604+
<target state="needs-review-translation">False</target>
1605+
</trans-unit>
15801606
</group>
15811607
</body>
15821608
</file>
@@ -1870,9 +1896,9 @@ Fichier Ini déplacé vers {0}.old</target>
18701896
<source>Windows standby. WinNUT will disconnect.</source>
18711897
<target state="final">Mise en veille de Windows. WinNUT va se déconnecter.</target>
18721898
</trans-unit>
1873-
<trans-unit id="XP_Information" translate="yes" extype="System.Resources.ResXFileRef, System.Windows.Forms" xml:space="preserve">
1899+
<trans-unit id="XP_Information" translate="no" extype="System.Resources.ResXFileRef, System.Windows.Forms" xml:space="preserve">
18741900
<source>..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</source>
1875-
<target state="needs-review-translation">..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
1901+
<target state="final">..\Resources\XP_Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</target>
18761902
</trans-unit>
18771903
<trans-unit id="DetectedPreviousPrefsData" translate="yes" xml:space="preserve">
18781904
<source>Previous preferences data detected in the Registry.</source>

0 commit comments

Comments
 (0)