update

1 files changed, 67 insertions, 315 deletions

diff --git a/i18n/zh_TW/systemtime.ts b/i18n/zh_TW/systemtime.ts
index add323c..0bb3b23 100644
--- a/i18n/zh_TW/systemtime.ts
+++ b/i18n/zh_TW/systemtime.ts
@@ -1,532 +1,284 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>FormatTabWidget</name>
-    <message>
-        <source>Time format</source>
-        <translation type="unfinished">時間格式</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="unfinished">hh:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="unfinished">D/M hh:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="unfinished">M/D hh:mm</translation>
-    </message>
-    <message>
-        <source>12/24 hour</source>
-        <translation type="unfinished">12/24 小時制</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="unfinished">24 小時制</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="unfinished">12 小時制</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="unfinished">日期格式</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="unfinished">一星期開始於</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished">星期日</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished">星期一</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>SystemTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished">設定</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished">預報</translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished">您要求延遲 </translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"> 分鐘, 但是只有 </translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Running:
-ntpdate </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time from network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished">在執行 ntpdate 時發生錯誤</translation>
-    </message>
-    <message>
-        <source>Time Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time from
- server: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"> 秒</translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished">無法連線到伺服器 </translation>
-    </message>
-</context>
-<context>
-    <name>NTPTabWidget</name>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>n/a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
-        <translation type="obsolete">time.fu-berlin.de</translation>
+        <translation>time.fu-berlin.de</translation>
     </message>
     <message>
         <source>Run NTP?</source>
-        <translation type="obsolete">執行 NTP?</translation>
+        <translation>執行 NTP?</translation>
     </message>
     <message>
         <source>You asked for a delay of </source>
-        <translation type="obsolete">您要求延遲 </translation>
+        <translation>您要求延遲 </translation>
     </message>
     <message>
         <source> minutes, but only </source>
-        <translation type="obsolete"> 分鐘, 但是只有 </translation>
+        <translation> 分鐘, 但是只有 </translation>
     </message>
     <message>
         <source> minutes elapsed since last lookup.</source>
-        <translation type="obsolete"> 分鐘前進行過查詢.</translation>
+        <translation> 分鐘前進行過查詢.</translation>
     </message>
     <message>
         <source>Rerun NTP?</source>
-        <translation type="obsolete">重新執行 NTP?</translation>
+        <translation>重新執行 NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
-        <translation type="obsolete">執行中:</translation>
+        <translation>執行中:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation type="obsolete">在執行 ntpdate 時發生錯誤</translation>
+        <translation>在執行 ntpdate 時發生錯誤</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="obsolete"> 秒</translation>
+        <translation> 秒</translation>
     </message>
     <message>
         <source>last [h]</source>
-        <translation type="obsolete">上次 [h]</translation>
+        <translation>上次 [h]</translation>
     </message>
     <message>
         <source>offset [s]</source>
-        <translation type="obsolete">誤差 [s]</translation>
+        <translation>誤差 [s]</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
-        <translation type="obsolete">移位 [s/h]</translation>
+        <translation>移位 [s/h]</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation type="obsolete"> s/h</translation>
+        <translation> s/h</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation type="obsolete">從網路取得時刻</translation>
+        <translation>從網路取得時刻</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
-        <translation type="obsolete">設定預報的時刻: </translation>
+        <translation>設定預報的時刻: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation type="obsolete">無法連線到伺服器 </translation>
+        <translation>無法連線到伺服器 </translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="obsolete">預報</translation>
+        <translation>預報</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
+        <translation>NTP</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation type="obsolete">主要</translation>
+        <translation>主要</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="obsolete">設定</translation>
+        <translation>設定</translation>
     </message>
     <message>
         <source>ntp error</source>
-        <translation type="obsolete">ntp 錯誤</translation>
+        <translation>ntp 錯誤</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
-        <translation type="obsolete">從網路取得時刻時發生錯誤!</translation>
+        <translation>從網路取得時刻時發生錯誤!</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
-        <translation type="obsolete">從伺服器取得時刻時
+        <translation>從伺服器取得時刻時
 發生錯誤</translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
-        <translation type="obsolete">網路時刻</translation>
+        <translation>網路時刻</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation type="obsolete">從網路取得時刻</translation>
+        <translation>從網路取得時刻</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation type="obsolete">開始時刻:</translation>
+        <translation>開始時刻:</translation>
     </message>
     <message>
         <source>nan</source>
-        <translation type="obsolete">nan</translation>
+        <translation>nan</translation>
     </message>
     <message>
         <source>Time Shift:</source>
-        <translation type="obsolete">時刻平移:</translation>
+        <translation>時刻平移:</translation>
     </message>
     <message>
         <source>New Time:</source>
-        <translation type="obsolete">新的時刻:</translation>
+        <translation>新的時刻:</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
-        <translation type="obsolete">估計平移:</translation>
+        <translation>估計平移:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
-        <translation type="obsolete">預報的時刻:</translation>
+        <translation>預報的時刻:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
-        <translation type="obsolete">平均平移:</translation>
+        <translation>平均平移:</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="obsolete">設定預報時刻</translation>
+        <translation>設定預報時刻</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation type="obsolete">預報時刻</translation>
+        <translation>預報時刻</translation>
     </message>
     <message>
         <source>Use</source>
-        <translation type="obsolete">使用</translation>
+        <translation>使用</translation>
     </message>
     <message>
         <source>as</source>
-        <translation type="obsolete">當做</translation>
+        <translation>當做</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
-        <translation type="obsolete">NTP 伺服器以便自網路取得時刻</translation>
+        <translation>NTP 伺服器以便自網路取得時刻</translation>
     </message>
     <message>
         <source>Wait for </source>
-        <translation type="obsolete">等候 </translation>
+        <translation>等候 </translation>
     </message>
     <message>
         <source>minutes until</source>
-        <translation type="obsolete">分鐘, 直到</translation>
+        <translation>分鐘, 直到</translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="obsolete">NTP 嘗試讓時鐘與網路同步.</translation>
+        <translation>NTP 嘗試讓時鐘與網路同步.</translation>
     </message>
     <message>
         <source>Insure a delay of</source>
-        <translation type="obsolete">確保延遲時間</translation>
+        <translation>確保延遲時間</translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="obsolete">將使用新的 NTP 查詢來預報時刻.</translation>
+        <translation>將使用新的 NTP 查詢來預報時刻.</translation>
     </message>
     <message>
         <source>Set time</source>
-        <translation type="obsolete">設定時刻</translation>
+        <translation>設定時刻</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation type="obsolete">主要</translation>
+        <translation>主要</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation type="obsolete">手動</translation>
+        <translation>手動</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="obsolete">設定</translation>
+        <translation>設定</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="obsolete">預報</translation>
+        <translation>預報</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
+        <translation>NTP</translation>
     </message>
     <message>
         <source>Advanced settings</source>
-        <translation type="obsolete">進階設定</translation>
-    </message>
-</context>
-<context>
-    <name>PredictTabWidget</name>
-    <message>
-        <source>Predicted time drift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>n/a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Estimated shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predicted time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift [s/h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last [h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Offset [s]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="unfinished">預報時刻</translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="unfinished">設定預報時刻</translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="unfinished"> s/h</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"> 秒</translation>
+        <translation>進階設定</translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation type="obsolete">時區</translation>
+        <translation>時區</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="obsolete">日期</translation>
+        <translation>日期</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation type="obsolete">時間格式</translation>
+        <translation>時間格式</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation type="obsolete">24 小時制</translation>
+        <translation>24 小時制</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation type="obsolete">12 小時制</translation>
+        <translation>12 小時制</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation type="obsolete">一星期開始於</translation>
+        <translation>一星期開始於</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="obsolete">星期日</translation>
+        <translation>星期日</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="obsolete">星期一</translation>
+        <translation>星期一</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation type="obsolete">日期格式</translation>
+        <translation>日期格式</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation type="obsolete">小程式格式</translation>
+        <translation>小程式格式</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation type="obsolete">hh:mm</translation>
+        <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M hh:mm</translation>
+        <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation type="obsolete">M/D hh:mm</translation>
+        <translation>M/D hh:mm</translation>
     </message>
     <message>
         <source>System Time</source>
-        <translation type="obsolete">系統時間</translation>
+        <translation>系統時間</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
-        <translation type="obsolete">時</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">分</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-</context>
-<context>
-    <name>SettingsTabWidget</name>
-    <message>
-        <source>Time server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes between time updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes between prediction updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display time server information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display time prediction information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeTabWidget</name>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished">時</translation>
+        <translation>時</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished">分</translation>
+        <translation>分</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished">AM</translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished">PM</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">日期</translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="unfinished">設定預報時刻</translation>
+        <translation>PM</translation>
     </message>
 </context>
 </TS>