5 files changed, 220 insertions, 199 deletions
diff --git a/i18n/zh_TW/opieplayer.ts b/i18n/zh_TW/opieplayer.ts
index b8f82ba..5550911 100644
--- a/i18n/zh_TW/opieplayer.ts
+++ b/i18n/zh_TW/opieplayer.ts
@@ -7,5 +7,7 @@ your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
-        <translation type="unfinished"></translation>
+        <translation>您的聲音裝置
+有些問題. 
+開啟(&quot;/dev/dsp&quot;)</translation>
     </message>
     <message>
@@ -13,9 +15,11 @@ open(&quot;/dev/dsp&quot;)
 
 Closing player now.</source>
-        <translation type="unfinished"></translation>
+        <translation>
+
+現在正在關閉播放程式.</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>放棄</translation>
     </message>
 </context>
@@ -24,5 +28,5 @@ Closing player now.</source>
     <message>
         <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie播放程式</translation>
     </message>
 </context>
@@ -31,45 +35,45 @@ Closing player now.</source>
     <message>
         <source>No file</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有檔案</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
+        <translation>錯誤: 尚未選擇檔案</translation>
     </message>
     <message>
         <source>File not found</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到檔案</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到下列檔案: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到解碼器</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>抱歉, 找不到適用於這個檔案的解碼器: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟檔案時發生錯誤</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>抱歉, 在嘗試播放此檔案時發生錯誤: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
-        <translation type="unfinished"></translation>
+        <translation> 檔案: </translation>
     </message>
     <message>
         <source>, Length: </source>
-        <translation type="unfinished"></translation>
+        <translation>, 長度: </translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>音樂</translation>
     </message>
 </context>
@@ -78,5 +82,5 @@ Closing player now.</source>
     <message>
         <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>播放清單選擇</translation>
     </message>
 </context>
@@ -85,121 +89,121 @@ Closing player now.</source>
     <message>
         <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie播放程式</translation>
     </message>
     <message>
         <source>Play Operations</source>
-        <translation type="unfinished"></translation>
+        <translation>播放作業</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
+        <translation>新增至播放清單</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
+        <translation>自播放清單中移除</translation>
     </message>
     <message>
         <source>Play</source>
-        <translation type="unfinished"></translation>
+        <translation>播放</translation>
     </message>
     <message>
         <source>Randomize</source>
-        <translation type="unfinished"></translation>
+        <translation>隨機選曲</translation>
     </message>
     <message>
         <source>Loop</source>
-        <translation type="unfinished"></translation>
+        <translation>循環播放</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>檔案</translation>
     </message>
     <message>
         <source>Clear List</source>
-        <translation type="unfinished"></translation>
+        <translation>清除清單</translation>
     </message>
     <message>
         <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
+        <translation>加入所有的音訊檔案</translation>
     </message>
     <message>
         <source>Add all video files</source>
-        <translation type="unfinished"></translation>
+        <translation>加入所有的視訊檔案</translation>
     </message>
     <message>
         <source>Add all files</source>
-        <translation type="unfinished"></translation>
+        <translation>加入所有檔案</translation>
     </message>
     <message>
         <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存播放清單</translation>
     </message>
     <message>
         <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟檔案或網址</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
+        <translation>重新描掃音訊檔案</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
+        <translation>重新描掃視訊檔案</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>檢視</translation>
     </message>
     <message>
         <source>Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>全螢幕</translation>
     </message>
     <message>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation>縮放</translation>
     </message>
     <message>
         <source>Move Up</source>
-        <translation type="unfinished"></translation>
+        <translation>上移</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>移除</translation>
     </message>
     <message>
         <source>Move Down</source>
-        <translation type="unfinished"></translation>
+        <translation>下移</translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>標題</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>大小</translation>
     </message>
     <message>
         <source>Media</source>
-        <translation type="unfinished"></translation>
+        <translation>媒體</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>音訊</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>視訊</translation>
     </message>
     <message>
         <source>Lists</source>
-        <translation type="unfinished"></translation>
+        <translation>清單</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
+        <translation>Opie播放程式: </translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation type="unfinished"></translation>
+        <translation>空間不足</translation>
     </message>
     <message>
@@ -207,54 +211,57 @@ Closing player now.</source>
 Your playlist may be missing some entries
 the next time you start it.</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存播放清單時發生問題.
+當您下次啟動播放清單時可能會發現
+其中的某些項目遺失了.</translation>
     </message>
     <message>
         <source>Invalid File</source>
-        <translation type="unfinished"></translation>
+        <translation>無效的檔案</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
+        <translation>取得該檔案時發生問題.</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
+        <translation>移除播放清單?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
-        <translation type="unfinished"></translation>
+        <translation>您確定要刪除
+這個播放清單?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>是</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>否</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>內容</translation>
     </message>
     <message>
         <source>Play Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>播放選擇的</translation>
     </message>
     <message>
         <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟檔案或網址</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
+        <translation>儲存 m3u 播放清單 </translation>
     </message>
     <message>
         <source>Skins</source>
-        <translation type="unfinished"></translation>
+        <translation>外皮</translation>
     </message>
     <message>
         <source>Path</source>
-        <translation type="unfinished"></translation>
+        <translation>路徑</translation>
     </message>
 </context>
@@ -263,5 +270,5 @@ this playlist?</source>
     <message>
         <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie播放程式</translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index b9ec769..98d859b 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -4,38 +4,39 @@
     <message>
         <source>Set passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>設定通行碼</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>輸入通行碼</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
-        <translation type="unfinished"></translation>
+        <translation>通行碼不正確</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>輸入的通行碼不正確.
+存取已拒絕</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>任何</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>無</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>輸入新的通行碼</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>重新輸入新的通行碼</translation>
     </message>
 </context>
@@ -44,57 +45,57 @@ Access denied</source>
     <message>
         <source>Security Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>安全性設定</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>清除通行碼</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation type="unfinished"></translation>
+        <translation>在電源開啟時要求輸入通行碼</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation type="unfinished"></translation>
+        <translation>同步化</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation type="unfinished"></translation>
+        <translation>允許來自網路的同步化:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished"></translation>
+        <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished"></translation>
+        <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>任何</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>無</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.129.0/24 (預設值)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.1.0/24</translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/showimg.ts b/i18n/zh_TW/showimg.ts
index 8f08d9e..c56dee3 100644
--- a/i18n/zh_TW/showimg.ts
+++ b/i18n/zh_TW/showimg.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Brightness</source>
-        <translation type="unfinished"></translation>
+        <translation>明亮度</translation>
     </message>
 </context>
@@ -11,9 +11,9 @@
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>標題</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>類型</translation>
     </message>
 </context>
@@ -22,101 +22,101 @@
     <message>
         <source>Image Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>影像瀏覽器</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
-        <translation type="unfinished"></translation>
+        <translation>垂直旋轉</translation>
     </message>
     <message>
         <source>Vertical flip</source>
-        <translation type="unfinished"></translation>
+        <translation>水平旋轉</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟</translation>
     </message>
     <message>
         <source>Rotate 180</source>
-        <translation type="unfinished"></translation>
+        <translation>旋轉180度</translation>
     </message>
     <message>
         <source>Rotate 90</source>
-        <translation type="unfinished"></translation>
+        <translation>旋轉90度</translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>全螢幕</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation> - 影像瀏覽器</translation>
     </message>
     <message>
         <source> True color</source>
-        <translation type="unfinished"></translation>
+        <translation>True Color</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>瀏覽</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Thumbnail View</translation>
     </message>
     <message>
         <source>Preferences..</source>
-        <translation type="unfinished"></translation>
+        <translation>設定..</translation>
     </message>
     <message>
         <source>Image Info ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Image Info ...</translation>
     </message>
     <message>
         <source>Open ...</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟 ...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
-        <translation type="unfinished"></translation>
+        <translation>旋轉</translation>
     </message>
     <message>
         <source>Brightness ...</source>
-        <translation type="unfinished"></translation>
+        <translation>明亮度 ...</translation>
     </message>
     <message>
         <source>Black And White</source>
-        <translation type="unfinished"></translation>
+        <translation>黑與白</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>符合螢幕</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>檔案</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>選項</translation>
     </message>
     <message>
         <source>%1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 顏色</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 alpha levels</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation>8-bit alpha channel</translation>
     </message>
     <message>
         <source>Slide show</source>
-        <translation type="unfinished"></translation>
+        <translation>投影片</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
-        <translation type="unfinished"></translation>
+        <translation>停止投影片</translation>
     </message>
 </context>
@@ -125,33 +125,33 @@
     <message>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>設定選項</translation>
     </message>
     <message>
         <source>Slide Show</source>
-        <translation type="unfinished"></translation>
+        <translation>投影片</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>每張圖像中的延遲</translation>
     </message>
     <message>
         <source>s</source>
-        <translation type="unfinished"></translation>
+        <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
-        <translation type="unfinished"></translation>
+        <translation>重復投影片</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
-        <translation type="unfinished"></translation>
+        <translation>Show pictures in reverse</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
-        <translation type="unfinished"></translation>
+        <translation>Load pictures rotated 90 degrees</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>快速讀取圖片</translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/systemtime.ts b/i18n/zh_TW/systemtime.ts
index 5958bed..0bb3b23 100644
--- a/i18n/zh_TW/systemtime.ts
+++ b/i18n/zh_TW/systemtime.ts
@@ -4,82 +4,95 @@
     <message>
         <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
+        <translation>time.fu-berlin.de</translation>
     </message>
     <message>
         <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
+        <translation>執行 NTP?</translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation>您要求延遲 </translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation> 分鐘, 但是只有 </translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation> 分鐘前進行過查詢.</translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation>重新執行 NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
-        <translation type="unfinished"></translation>
+        <translation>執行中:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
+        <translation>在執行 ntpdate 時發生錯誤</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> 秒</translation>
     </message>
     <message>
         <source>last [h]</source>
-        <translation type="unfinished"></translation>
+        <translation>上次 [h]</translation>
     </message>
     <message>
         <source>offset [s]</source>
-        <translation type="unfinished"></translation>
+        <translation>誤差 [s]</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <translation>移位 [s/h]</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <translation> s/h</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation type="unfinished"></translation>
+        <translation>從網路取得時刻</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
+        <translation>設定預報的時刻: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <translation>無法連線到伺服器 </translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="unfinished"></translation>
+        <translation>預報</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation type="unfinished"></translation>
+        <translation>NTP</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation>主要</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>設定</translation>
     </message>
     <message>
         <source>ntp error</source>
-        <translation type="unfinished"></translation>
+        <translation>ntp 錯誤</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
-        <translation type="unfinished"></translation>
+        <translation>從網路取得時刻時發生錯誤!</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation type="unfinished"></translation>
+        <translation>從伺服器取得時刻時
+發生錯誤</translation>
     </message>
 </context>
@@ -88,105 +101,105 @@
     <message>
         <source>Network Time</source>
-        <translation type="unfinished"></translation>
+        <translation>網路時刻</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation type="unfinished"></translation>
+        <translation>從網路取得時刻</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation type="unfinished"></translation>
+        <translation>開始時刻:</translation>
     </message>
     <message>
         <source>nan</source>
-        <translation type="unfinished"></translation>
+        <translation>nan</translation>
     </message>
     <message>
         <source>Time Shift:</source>
-        <translation type="unfinished"></translation>
+        <translation>時刻平移:</translation>
     </message>
     <message>
         <source>New Time:</source>
-        <translation type="unfinished"></translation>
+        <translation>新的時刻:</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
-        <translation type="unfinished"></translation>
+        <translation>估計平移:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
-        <translation type="unfinished"></translation>
+        <translation>預報的時刻:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
-        <translation type="unfinished"></translation>
+        <translation>平均平移:</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>設定預報時刻</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation type="unfinished"></translation>
+        <translation>預報時刻</translation>
     </message>
     <message>
         <source>Use</source>
-        <translation type="unfinished"></translation>
+        <translation>使用</translation>
     </message>
     <message>
         <source>as</source>
-        <translation type="unfinished"></translation>
+        <translation>當做</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>NTP 伺服器以便自網路取得時刻</translation>
     </message>
     <message>
         <source>Wait for </source>
-        <translation type="unfinished"></translation>
+        <translation>等候 </translation>
     </message>
     <message>
         <source>minutes until</source>
-        <translation type="unfinished"></translation>
+        <translation>分鐘, 直到</translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>NTP 嘗試讓時鐘與網路同步.</translation>
     </message>
     <message>
         <source>Insure a delay of</source>
-        <translation type="unfinished"></translation>
+        <translation>確保延遲時間</translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="unfinished"></translation>
+        <translation>將使用新的 NTP 查詢來預報時刻.</translation>
     </message>
     <message>
         <source>Set time</source>
-        <translation type="unfinished"></translation>
+        <translation>設定時刻</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation>主要</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>手動</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>設定</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="unfinished"></translation>
+        <translation>預報</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation type="unfinished"></translation>
+        <translation>NTP</translation>
     </message>
     <message>
         <source>Advanced settings</source>
-        <translation type="unfinished"></translation>
+        <translation>進階設定</translation>
     </message>
 </context>
@@ -195,57 +208,57 @@
     <message>
         <source>Time Zone</source>
-        <translation type="unfinished"></translation>
+        <translation>時區</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>日期</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation type="unfinished"></translation>
+        <translation>時間格式</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation type="unfinished"></translation>
+        <translation>24 小時制</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation type="unfinished"></translation>
+        <translation>12 小時制</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation type="unfinished"></translation>
+        <translation>一星期開始於</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished"></translation>
+        <translation>星期日</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished"></translation>
+        <translation>星期一</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation type="unfinished"></translation>
+        <translation>日期格式</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation type="unfinished"></translation>
+        <translation>小程式格式</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>M/D hh:mm</translation>
     </message>
     <message>
         <source>System Time</source>
-        <translation type="unfinished"></translation>
+        <translation>系統時間</translation>
     </message>
 </context>
@@ -254,17 +267,17 @@
     <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"></translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/tableviewer.ts b/i18n/zh_TW/tableviewer.ts
index 7d41b6f..688df1d 100644
--- a/i18n/zh_TW/tableviewer.ts
+++ b/i18n/zh_TW/tableviewer.ts
@@ -4,9 +4,9 @@
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
+        <translation>KeyList::addKey() 無法設定預設值 %1, Key not added.</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
+        <translation>DataElem::setField(%1, %2) No valid type found</translation>
     </message>
 </context>
@@ -15,9 +15,9 @@
     <message>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>重設</translation>
     </message>
     <message>
         <source>key</source>
-        <translation type="unfinished"></translation>
+        <translation>key</translation>
     </message>
 </context>
@@ -26,25 +26,25 @@
     <message>
         <source>TableViewer - Edit Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>TableViewer - Edit Keys</translation>
     </message>
     <message>
         <source>Key Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Key Name</translation>
     </message>
     <message>
         <source>Key Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Key Type</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>新文件</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>刪除</translation>
     </message>
     <message>
         <source>Clear All</source>
-        <translation type="unfinished"></translation>
+        <translation>清除全部</translation>
     </message>
 </context>
@@ -53,5 +53,5 @@
     <message>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Table Viewer</translation>
     </message>
 </context>
@@ -60,9 +60,9 @@
     <message>
         <source>Table Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Table Viewer</translation>
     </message>
     <message>
         <source>could not load Document</source>
-        <translation type="unfinished"></translation>
+        <translation>無法開啟文件</translation>
     </message>
 </context>