20 files changed, 387 insertions, 179 deletions

diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 497b27c..689b51d 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -1,242 +1,245 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>全名</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>選取</translation>
     </message>
 </context>
 <context>
+    <name>AbView</name>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">未歸檔</translation>
+    </message>
+</context>
+<context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>Contact</source>
-        <translation>聯絡人</translation>
+        <translation type="obsolete">聯絡人</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>新增</translation>
+        <translation type="obsolete">新增</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>編輯</translation>
+        <translation type="obsolete">編輯</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>刪除</translation>
+        <translation type="obsolete">刪除</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>搜尋</translation>
+        <translation type="obsolete">搜尋</translation>
     </message>
     <message>
         <source>Write Mail To</source>
-        <translation>寫電郵給</translation>
+        <translation type="obsolete">寫電郵給</translation>
     </message>
     <message>
         <source>Beam Entry</source>
-        <translation>傳送項目</translation>
+        <translation type="obsolete">傳送項目</translation>
     </message>
     <message>
         <source>My Personal Details</source>
-        <translation>個人資料</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation></translation>
+        <translation type="obsolete">個人資料</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>編輯個人資料</translation>
     </message>
     <message>
         <source>Edit Address</source>
-        <translation>編輯地址</translation>
+        <translation type="obsolete">編輯地址</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>聯絡人 - 個人資料&quot;</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>儲存空間不足</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>無法儲存資料
 請先釋放些儲存空間後再試一次
 退出?
 </translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>未歸檔</translation>
+        <translation type="obsolete">未歸檔</translation>
     </message>
     <message>
         <source>Import vCard</source>
-        <translation>輸入 cVard</translation>
+        <translation type="obsolete">輸入 cVard</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation>關閉搜尋</translation>
+        <translation type="obsolete">關閉搜尋</translation>
     </message>
     <message>
         <source>Save all Data</source>
-        <translation>儲存所有資料</translation>
+        <translation type="obsolete">儲存所有資料</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation>設定</translation>
+        <translation type="obsolete">設定</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>未找到</translation>
     </message>
     <message>
         <source>List</source>
-        <translation>列出</translation>
+        <translation type="obsolete">列出</translation>
     </message>
     <message>
         <source>Cards</source>
-        <translation>名片</translation>
+        <translation type="obsolete">名片</translation>
     </message>
     <message>
         <source>Card</source>
-        <translation>名片</translation>
+        <translation type="obsolete">名片</translation>
     </message>
     <message>
         <source>Start Search</source>
-        <translation>開始搜尋</translation>
+        <translation type="obsolete">開始搜尋</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>是正確檔案類型嘛?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;是</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;否</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>無法找到此型態的聯絡人</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>選擇的檔案不是以&quot;.vcf&quot;結束.確定要開啟?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>新增聯絡人?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>確定要在%1加入聯絡人?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;全部都是</translation>
     </message>
     <message>
-        <source>Export vCard</source>
+        <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You have to select a contact !</source>
+        <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You have to set a filename !</source>
+        <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>查詢樣式</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>使用一般的表達方式</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>使用萬用字元(*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>大小寫不同</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>郵件</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>採用QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>採用Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>注意: QT-Maily僅在Sharp的預設ROM中提供.Opie-Mail可免費安裝 </translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>搜尋之設定</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>小</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>大</translation>
     </message>
@@ -1280,128 +1283,163 @@ is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie</name>
+    <message>
+        <source>Contact</source>
+        <translation type="unfinished">聯絡人</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished">聯絡人</translation>
+    </message>
+    <message>
+        <source>Start Search</source>
+        <translation type="unfinished">開始搜尋</translation>
+    </message>
+    <message>
+        <source>Write Mail To</source>
+        <translation type="unfinished">寫電郵給</translation>
+    </message>
+    <message>
+        <source>Import vCard</source>
+        <translation type="unfinished">輸入 cVard</translation>
+    </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Personal Details</source>
+        <translation type="unfinished">個人資料</translation>
+    </message>
+    <message>
+        <source>Show quick search bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">公司電話號碼</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">公司傳真號碼</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">公司手機號碼</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">預設電郵地址</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">電子郵件</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">住家電話號碼</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">住家傳真號碼</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">私人手機號碼</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">公司</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">職業</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">助理</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">經理</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">配偶</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">性別</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">週年紀念日</translation>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index fddbbf3..a5ce303 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -1,285 +1,293 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>目前的主題</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>編輯...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
-        <translation>強制將樣式套用到所有的應用程式.</translation>
+        <translation type="obsolete">強制將樣式套用到所有的應用程式.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation>停用這些應用程式的樣式(可以用 &lt;b&gt;*&lt;/b&gt; 當作萬用字元):</translation>
+        <translation type="obsolete">停用這些應用程式的樣式(可以用 &lt;b&gt;*&lt;/b&gt; 當作萬用字元):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
-        <translation>二元檔</translation>
+        <translation type="obsolete">二元檔</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>標籤頁樣式:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>索引標籤</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>有圖示的索引標籤</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>直式索引標籤</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>有圖示的直式索引標籤</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>頂端</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>底部</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>樣式</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>顏色</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>視窗</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="obsolete">重新啟動</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation type="obsolete">您現在想要重新啟動 %1 ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="obsolete">是</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="obsolete">否</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>儲存主題</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>儲存主題</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>主題已經存在.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>刪除主題</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>無法刪除目前的主題.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
-        <translation>&lt;新增&gt;</translation>
+        <translation type="obsolete">&lt;新增&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>樣式控制了按鈕, 捲動軸等項目在所有應用程式中的顯示方式.
 
 請按這裡以選擇可以使用的樣式.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>請按這裡以設定目前選擇的樣式.
 
 注意: 並非所有的樣式都有這個選項.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>視窗裝飾控制了應用程式的標題列與其按鈕的顯示方式.
 
 請按這裡以選擇可以使用的裝飾.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>選擇想要的名稱, 樣式和應用程式所使用的預設字型大小.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>色彩主題是用在顯示時各個部份的顏色的集合.
 
 請按這裡以選擇可以使用的主題.</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>按這裡以改變目前的色彩主題中的顏色.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>按這裡以刪除在左方清單中所選擇的色彩主題.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>按這裡以命名並儲存目前的色彩主題.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation>按這裡讓所有的應用程式使用全域外觀設定值.</translation>
+        <translation type="obsolete">按這裡讓所有的應用程式使用全域外觀設定值.</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
-        <translation>如果某些應用程式無法正確地以全域外觀設定值顯示, 您可以關閉用於該應用程式的某些功能.
+        <translation type="obsolete">如果某些應用程式無法正確地以全域外觀設定值顯示, 您可以關閉用於該應用程式的某些功能.
 
 這個區域允許您選擇要那些程式停用設定值.</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
-        <translation>按這裡來將應用程式加入上面的清單.</translation>
+        <translation type="obsolete">按這裡來將應用程式加入上面的清單.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
-        <translation>按這裡以刪除目前選擇的應用程式.</translation>
+        <translation type="obsolete">按這裡以刪除目前選擇的應用程式.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
-        <translation>按這裡讓目前選擇的應用程式在清單中向上移動.</translation>
+        <translation type="obsolete">按這裡讓目前選擇的應用程式在清單中向上移動.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation>按這裡讓目前選擇的應用程式在清單中向下移動.</translation>
+        <translation type="obsolete">按這裡讓目前選擇的應用程式在清單中向下移動.</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>按這裡以選擇想要的索引標籤對話盒(本應用程式屬之)樣式. 可用的樣式有:
 
 1. 索引標籤 - 普通, 只有文字標籤的索引標籤
 2. 有圖示的索引標籤 - 每個索引標籤都有圖示, 文字標籤只出現在目前的索引標籤
 3. 直式索引標籤 - 垂直排列的索引標籤
 4. 有圖示的直式索引標籤 - 垂直排列且有圖示的索引標籤</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>按這裡讓索引標籤出現在視窗的頂端.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>按這裡讓索引標籤出現在視窗的底部.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>這是一個預覽視窗. 在這裡可以看到在改變選項之後的新外觀.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Scrollbars on the left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to display scrollbars on the left side instead of the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>編輯主題</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>按這裡來選擇顏色: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>範例</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>一般項目</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>停用的項目</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>選單</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>一般文字</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>突顯的文字</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>按鈕</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>核取方塊</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>範例視窗使用選擇的設定值.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/backup.ts b/i18n/zh_TW/backup.ts
index 822744e..f61c78a 100644
--- a/i18n/zh_TW/backup.ts
+++ b/i18n/zh_TW/backup.ts
@@ -1,156 +1,156 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="obsolete">備份與還原...執行中...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>備份與還原</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished">還原</translation>
+    </message>
+    <message>
+        <source>Would you really overwrite your local data?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>備份與還原</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>備份</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>應用程式</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="obsolete">儲存至</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp; 備份</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>還原</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>選擇來源</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>第一行</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;還原</translation>
     </message>
     <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Data (Configuration + PIM)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Backup (Root File System)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/calculator.ts b/i18n/zh_TW/calculator.ts
index 5903018..01e8088 100644
--- a/i18n/zh_TW/calculator.ts
+++ b/i18n/zh_TW/calculator.ts
@@ -1,187 +1,191 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>Experimental Calculator</source>
-        <translation>實驗用計算機</translation>
+        <translation type="obsolete">實驗用計算機</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
+    <message>
+        <source>Calculator</source>
+        <translation type="unfinished">計算機</translation>
+    </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
         <translation type="obsolete">計算機</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>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index e284784..b566d81 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -310,128 +310,147 @@ Quit anyway?</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">開始</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">家</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
     </message>
 </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>DateBookWeekLstEvent</name>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">編輯</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">刪除</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <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>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>行事曆</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>重覆...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>每日...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>每星期...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>每月...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>每年...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>開始時間</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>結束時間</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/zh_TW/gutenbrowser.ts b/i18n/zh_TW/gutenbrowser.ts
index 1bfae93..70a3769 100644
--- a/i18n/zh_TW/gutenbrowser.ts
+++ b/i18n/zh_TW/gutenbrowser.ts
@@ -1,164 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
-        <source>Gutenbrowser Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Downloading Gutenberg Index....</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -168,201 +168,201 @@ http://www.trolltech.com
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Error opening local library index:&lt;/P&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/launchersettings.ts b/i18n/zh_TW/launchersettings.ts
index 679868d..c75d513 100644
--- a/i18n/zh_TW/launchersettings.ts
+++ b/i18n/zh_TW/launchersettings.ts
@@ -194,77 +194,85 @@
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable static background pixmap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libaboutapplet.ts b/i18n/zh_TW/libaboutapplet.ts
index f6e6187..77c88cd 100644
--- a/i18n/zh_TW/libaboutapplet.ts
+++ b/i18n/zh_TW/libaboutapplet.ts
@@ -1,74 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopiecore2.ts b/i18n/zh_TW/libopiecore2.ts
index 4a4f2b2..427ef9e 100644
--- a/i18n/zh_TW/libopiecore2.ts
+++ b/i18n/zh_TW/libopiecore2.ts
@@ -1,88 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Rotate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Hinge1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hinge2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hinge3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopiepim2.ts b/i18n/zh_TW/libopiepim2.ts
index 11bda08..ce08ef9 100644
--- a/i18n/zh_TW/libopiepim2.ts
+++ b/i18n/zh_TW/libopiepim2.ts
@@ -313,217 +313,185 @@ and </source>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">星期日</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">每</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Time:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Pick Time:</translation>
     </message>
 </context>
 <context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to view all items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view items belonging to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to view all unfiled items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to search for an item.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to filter the items displayed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to modify the current filter settings.</source>
+        <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/libvmemoapplet.ts b/i18n/zh_TW/libvmemoapplet.ts
index 03aeafa..fde7067 100644
--- a/i18n/zh_TW/libvmemoapplet.ts
+++ b/i18n/zh_TW/libvmemoapplet.ts
@@ -1,13 +1,17 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VMemo</name>
     <message>
         <source>Note</source>
         <translation>筆記</translation>
     </message>
     <message>
         <source>error recording</source>
         <translation>錯誤記錄</translation>
     </message>
+    <message>
+        <source>&lt;B&gt;&lt;P&gt;&lt;font size=+2&gt;VMemo-Recording&lt;/font&gt;&lt;/B&gt;&lt;p&gt;%1&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libwlan.ts b/i18n/zh_TW/libwlan.ts
index d7985ab..da97782 100644
--- a/i18n/zh_TW/libwlan.ts
+++ b/i18n/zh_TW/libwlan.ts
@@ -1,148 +1,165 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>Wireless Configuration</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>any</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WlanInfo</name>
     <message>
-        <source>Interface Information</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>802.11b</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Freq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>Link Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AP</source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
     <message>
-        <source>Noise</source>
+        <source>WLan Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WlanInfo</name>
+</context>
 </TS>
diff --git a/i18n/zh_TW/opie-eye.ts b/i18n/zh_TW/opie-eye.ts
index 1fb34c5..02da4de 100644
--- a/i18n/zh_TW/opie-eye.ts
+++ b/i18n/zh_TW/opie-eye.ts
@@ -23,266 +23,278 @@
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>the Image %1</source>
+        <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
+        <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start slideshow</source>
+        <source>the Image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
         <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dont show seperate windows</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocView</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm Deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opieirc.ts b/i18n/zh_TW/opieirc.ts
index ad2176c..b23aa7d 100644
--- a/i18n/zh_TW/opieirc.ts
+++ b/i18n/zh_TW/opieirc.ts
@@ -1,66 +1,125 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DCCProgress</name>
+    <message>
+        <source>Receiving file %1 from %2...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Successfully received %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aborted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Peer Aborted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DCCTransferTab</name>
+    <message>
+        <source>DCC Transfers in Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DCC Transfer from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is trying to send you the file %2
+(%3 bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -247,129 +306,141 @@ Real name: %4</source>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Malformed DCC request from </source>
+        <source>Received a CTCP PING reply from %1: %2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received a CTCP PING request from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Malformed DCC request from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_TW/opierec.ts b/i18n/zh_TW/opierec.ts
index b7d47ec..6092bd6 100644
--- a/i18n/zh_TW/opierec.ts
+++ b/i18n/zh_TW/opierec.ts
@@ -18,147 +18,134 @@
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Disk Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Please select file to play</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/ordesktop.ts b/i18n/zh_TW/ordesktop.ts
index 4eb9e18..abaf308 100644
--- a/i18n/zh_TW/ordesktop.ts
+++ b/i18n/zh_TW/ordesktop.ts
@@ -1,2 +1,49 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QMyDialog</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server Desc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <comment>Add Connection</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QMyScrollView</name>
+    <message>
+        <source>Remote Desktop Client (RDP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/packagemanager.ts b/i18n/zh_TW/packagemanager.ts
index e189dab..49a7d91 100644
--- a/i18n/zh_TW/packagemanager.ts
+++ b/i18n/zh_TW/packagemanager.ts
@@ -472,215 +472,227 @@ Tap inside the box at the left to select a package.  Tap and hold to view packag
         <source>Configuration</source>
         <translation type="unfinished">設定</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">選項</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">新的</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">啟動</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">Force Depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">Force Reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">Force Remove</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">Force Overwrite</translation>
     </message>
     <message>
-        <source>Information Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to delete the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the URL address of the HTTP proxy server here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the HTTP proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the URL address of the FTP proxy server here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the FTP proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the username for the proxy servers here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the password for the proxy servers here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select information level for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Information level:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package source lists directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the directory where package source feed information is stored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the directory where package source feed information is stored.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OIpkgDestDlg</name>
     <message>
         <source>Edit Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to indicate whether this entry is active or not.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the name of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the absolute directory path of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to select the desired location.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgServerDlg</name>
     <message>
         <source>Edit Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to indicate whether this entry is active or not.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the name of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the URL address of this entry here.</source>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index ac4ac62..932ee0c 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -455,129 +455,129 @@ Please charge the back-up battery.</source>
         <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>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">終止Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">重開機</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">重新啟動Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <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 type="unfinished">&lt;p&gt;
+        <translation type="obsolete">&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 type="unfinished">取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <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 type="obsolete">&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 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 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 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 or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">同步中</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;連結&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;取消</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index f405b68..c3bdeac 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -49,143 +49,143 @@ You can only select an actually configured user.</source>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">同步化</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished">任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">無</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-multiauth-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Testing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test the authentication now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/systemtime.ts b/i18n/zh_TW/systemtime.ts
index 4179978..86d99bb 100644
--- a/i18n/zh_TW/systemtime.ts
+++ b/i18n/zh_TW/systemtime.ts
@@ -49,128 +49,132 @@
 <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>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>Could not connect to 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;Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Retrieving time from network...</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>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>