use translations from BRANCH

9 files changed, 583 insertions, 64 deletions

diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 46b51d2..e2f8c34 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -26,37 +26,37 @@
         <translation>重新命名</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>執行指令</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>執行指令並輸出</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>切換至本地端</translation>
+        <translation type="obsolete">切換至本地端</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>切換至遠端</translation>
+        <translation type="obsolete">切換至遠端</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
@@ -248,32 +248,52 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>將輸出存為檔案(只有名稱)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>輸出</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -337,18 +357,22 @@ Finished
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/calculator.ts b/i18n/zh_TW/calculator.ts
index 40deefb..9a36777 100644
--- a/i18n/zh_TW/calculator.ts
+++ b/i18n/zh_TW/calculator.ts
@@ -120,17 +120,216 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
         <translation>計算機</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>標準</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">標準</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index a18db60..e8946f4 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -350,40 +350,32 @@ Quit anyway?</translation>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. 一月-00. 一月</translation>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
@@ -465,33 +457,33 @@ Quit anyway?</translation>
         <translation>旅行</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>家</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>開始時間</translation>
+        <translation type="obsolete">開始時間</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>終日</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>時區</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;A鬧鐘</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>分鐘</translation>
@@ -511,32 +503,36 @@ Quit anyway?</translation>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>序述</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>開始 - 結束</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>備忘錄...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">開始時間</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>編輯備忘錄</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
diff --git a/i18n/zh_TW/libbatteryapplet.ts b/i18n/zh_TW/libbatteryapplet.ts
index cbc1577..94fc1e5 100644
--- a/i18n/zh_TW/libbatteryapplet.ts
+++ b/i18n/zh_TW/libbatteryapplet.ts
@@ -68,18 +68,30 @@
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index f71ec64..9be9eda 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -848,32 +848,48 @@ Free some memory and try again.</source>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">錯誤</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 文件</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF 卡</translation>
     </message>
     <message>
         <source>Hard Disk</source>
diff --git a/i18n/zh_TW/mailit.ts b/i18n/zh_TW/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/zh_TW/mailit.ts
+++ b/i18n/zh_TW/mailit.ts
@@ -187,32 +187,45 @@ associated to this mail
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login failed
 Check user name and password&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/opieftp.ts b/i18n/zh_TW/opieftp.ts
index f105433..c06a8f5 100644
--- a/i18n/zh_TW/opieftp.ts
+++ b/i18n/zh_TW/opieftp.ts
@@ -232,18 +232,22 @@ It must be empty</source>
     <message>
         <source>That directory does not exist</source>
         <translation>目錄並不存在</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>重新整理</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>新主機名稱</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>名稱已經存在</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index fa55075..0eb61fc 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -1,256 +1,481 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">應用程式問題</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>應用程式問題</translation>
+        <translation type="obsolete">應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>請按下十字架中心以校正觸控筆</translation>
+        <translation type="obsolete">請按下十字架中心以校正觸控筆</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>歡迎進入Opie</translation>
+        <translation type="obsolete">歡迎進入Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>文件</translation>
+        <translation type="obsolete">文件</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>圖示瀏覽</translation>
+        <translation type="obsolete">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>列表瀏覽</translation>
+        <translation type="obsolete">列表瀏覽</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>低電量警告! 
+        <translation type="obsolete">低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>低電量</translation>
+        <translation type="obsolete">低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>低電量警告.
+        <translation type="obsolete">低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>business card </translation>
+        <translation type="obsolete">business card </translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">訊息</translation>
+        <translation type="obsolete">訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
+        <translation type="obsolete">&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">電池狀態</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>啟動器</translation>
+        <translation type="unfinished">啟動器</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation> - 啟動器</translation>
+        <translation type="unfinished"> - 啟動器</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>無應用程式</translation>
+        <translation type="unfinished">無應用程式</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
+        <translation type="unfinished">&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">文件</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Finding documents</source>
+        <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">圖示瀏覽</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">列表瀏覽</translation>
+    </message>
     <message>
-        <source>Searching documents</source>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 檔案</translation>
+        <translation type="obsolete">%1 檔案</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>所有類型檔案</translation>
+        <translation type="obsolete">所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>文件瀏覽</translation>
+        <translation type="unfinished">文件瀏覽</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>中間插入</translation>
+        <translation type="obsolete">中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
+        <translation type="obsolete">A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Which media files</translation>
+        <translation type="obsolete">Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>音效</translation>
+        <translation type="obsolete">音效</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>圖形</translation>
+        <translation type="obsolete">圖形</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>文字</translation>
+        <translation type="obsolete">文字</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>影像</translation>
+        <translation type="obsolete">影像</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>所有</translation>
+        <translation type="obsolete">所有</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>連結程式</translation>
+        <translation type="obsolete">連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Limit search to dir: (not used yet)</translation>
+        <translation type="obsolete">Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>加入</translation>
+        <translation type="obsolete">加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>你的決定將存在儲存媒体當中</translation>
+        <translation type="obsolete">你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>不再詢問這一個儲存媒体</translation>
+        <translation type="obsolete">不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation type="unfinished">電池狀態</translation>
+        <translation type="obsolete">電池狀態</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">訊息</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">低電量警告! 
+請把電源關掉直到插上插座</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">低電量警告.
+請換上備份電池</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">business card </translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation>終止</translation>
+        <translation type="unfinished">終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>終止Opie</translation>
+        <translation type="unfinished">終止Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>重開機</translation>
+        <translation type="unfinished">重開機</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>重新啟動Opie</translation>
+        <translation type="unfinished">重新啟動Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>關機</translation>
+        <translation type="unfinished">關機</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>取消</translation>
+        <translation type="unfinished">取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>關機..</translation>
+        <translation type="unfinished">關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>同步連結</translation>
+        <translation type="unfinished">同步連結</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
+        <translation type="unfinished">&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>沒有權限</translation>
+        <translation type="unfinished">沒有權限</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
+        <translation type="unfinished">&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>淮許</translation>
+        <translation type="unfinished">淮許</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>同步中</translation>
+        <translation type="obsolete">同步中</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;連結&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;連結&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;取消</translation>
+        <translation type="obsolete">&amp;取消</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/showimg.ts b/i18n/zh_TW/showimg.ts
index c56dee3..270696a 100644
--- a/i18n/zh_TW/showimg.ts
+++ b/i18n/zh_TW/showimg.ts
@@ -108,32 +108,62 @@
         <translation>%1 alpha levels</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha channel</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>投影片</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>停止投影片</translation>
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>設定選項</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>投影片</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>每張圖像中的延遲</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>