Merge from BRANCH_1_0.

1 files changed, 21 insertions, 13 deletions

diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 5ee0e1e..fa55075 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -51,42 +51,35 @@ Keep power off until power restored!</source>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation >低電量警告.
+        <translation>低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>business card </translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>訊息</translation>
+        <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>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+        <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>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation >電池狀態</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>啟動器</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - 啟動器</translation>
@@ -94,16 +87,24 @@ Please charge the back-up battery.</source>
     <message>
         <source>No application</source>
         <translation>無應用程式</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>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 檔案</translation>
     </message>
     <message>
@@ -118,25 +119,25 @@ Please charge the back-up battery.</source>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>中間插入</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>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>
     </message>
     <message>
         <source>Audio</source>
-        <translation >音效</translation>
+        <translation>音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
@@ -150,32 +151,39 @@ Please charge the back-up battery.</source>
         <translation>所有</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation >Limit search to dir: (not used yet)</translation>
+        <translation>Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">電池狀態</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>終止Opie</translation>