- make opie-lupdate -noobsolete

37 files changed, 133 insertions, 2329 deletions

diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 689b51d..8c97bcc 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -25,56 +25,20 @@
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>聯絡人</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">聯絡人</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">新增</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">編輯</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">刪除</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">搜尋</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">寫電郵給</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">傳送項目</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <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 type="obsolete">編輯地址</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>聯絡人 - 個人資料&quot;</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>儲存空間不足</translation>
@@ -92,52 +56,16 @@ Quit anyway?</source>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">未歸檔</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">輸入 cVard</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">關閉搜尋</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">儲存所有資料</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">設定</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>未找到</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">列出</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">名片</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">名片</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">開始搜尋</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>是正確檔案類型嘛?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;是</translation>
@@ -1375,174 +1303,7 @@ is provided free !</source>
     </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>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">綽號</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">子女</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">名稱</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">名</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">中名</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">姓</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Suffix</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">歸檔為</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">職稱</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">部門</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">公司</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">公司所在街道名稱</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">公司所在城市名稱</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">公司所在州名</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">公司郵遞區號</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">公司所在國家名稱</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">公司呼叫器號碼</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">公司網頁</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">住家所在街道名稱</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">住家所在城市名稱</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">住家所在州名</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">住家郵遞區號</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">住家所在國家名稱</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">個人網頁</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">備註</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 90b925f..63d30ff 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -67,16 +67,12 @@
     </message>
     <message>
         <source>Could not rename</source>
         <translation>無法重新命名</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">該目錄不存在</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>複製為</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>進階檔案管理程式輸出</translation>
@@ -143,80 +139,32 @@
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>複製相同的目錄</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">無法複製</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">至</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">無法移動</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>新增至文件</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>動作</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>選擇全部</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">確定要刪除
-%1 個檔案?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>刪除目錄?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">確定要複製
-%1 個檔案?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>檔案已存在!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete"> 已存在. 要覆蓋嗎?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete"> 已經存在.
-您確定要刪除它?</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">進階型檔案管理程式
- 版權 2002-2003 
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-,授權為 GPL</translation>
-    </message>
-    <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index a5ce303..df8b208 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -19,24 +19,12 @@
     </message>
     <message>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <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 type="obsolete">停用這些應用程式的樣式(可以用 &lt;b&gt;*&lt;/b&gt; 當作萬用字元):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">二元檔</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>標籤頁樣式:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>索引標籤</translation>
@@ -79,28 +67,12 @@
     </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>
@@ -115,16 +87,12 @@
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>無法刪除目前的主題.</translation>
     </message>
     <message>
-        <source>&lt;new&gt;</source>
-        <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>
@@ -167,40 +135,12 @@ Click here to select an available scheme.</source>
     </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 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 type="obsolete">如果某些應用程式無法正確地以全域外觀設定值顯示, 您可以關閉用於該應用程式的某些功能.
-
-這個區域允許您選擇要那些程式停用設定值.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">按這裡來將應用程式加入上面的清單.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">按這裡以刪除目前選擇的應用程式.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">按這裡讓目前選擇的應用程式在清單中向上移動.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <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>
diff --git a/i18n/zh_TW/backup.ts b/i18n/zh_TW/backup.ts
index f61c78a..5c25a57 100644
--- a/i18n/zh_TW/backup.ts
+++ b/i18n/zh_TW/backup.ts
@@ -1,14 +1,10 @@
 <!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>
@@ -95,16 +91,12 @@
     </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>
diff --git a/i18n/zh_TW/calculator.ts b/i18n/zh_TW/calculator.ts
index 01e8088..30c2559 100644
--- a/i18n/zh_TW/calculator.ts
+++ b/i18n/zh_TW/calculator.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">實驗用計算機</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
@@ -126,16 +122,12 @@
         <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>
diff --git a/i18n/zh_TW/clock.ts b/i18n/zh_TW/clock.ts
index 7bf6850..33999dc 100644
--- a/i18n/zh_TW/clock.ts
+++ b/i18n/zh_TW/clock.ts
@@ -37,60 +37,24 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">打盹</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">時鐘</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">碼表</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>重設</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">設定鬧鐘</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">鬧鐘已開啟</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">鬧鐘已關閉</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">設定時間與日期</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Clock: Alarm was missed.</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
@@ -236,48 +200,7 @@ one day to be selected.</source>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">設定鬧鐘</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">小時</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">分鐘</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Snooze Delay(new line)
-(minutes)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 alarm</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">全部</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index b566d81..aa3c197 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -337,12 +337,20 @@ Quit anyway?</translation>
         <translation type="unfinished">家</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
@@ -540,16 +548,12 @@ Quit anyway?</translation>
         <translation>開始 - 結束</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>備忘錄...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">開始時間</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/embeddedkonsole.ts b/i18n/zh_TW/embeddedkonsole.ts
index 1b52294..ac499d9 100644
--- a/i18n/zh_TW/embeddedkonsole.ts
+++ b/i18n/zh_TW/embeddedkonsole.ts
@@ -25,32 +25,12 @@
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>終端機</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">微型</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">小型固定式</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">中型固定式</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete">字型</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">選項</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
@@ -81,40 +61,24 @@
     </message>
     <message>
         <source>Hide command list</source>
         <translation>隱藏指令清單</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">索引標籤在底部</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>黑底綠字</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>白底黑字</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>黑底白字</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">黑字, 透明背景</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">紅底黑字</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">黑底紅字</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>黃底綠字</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>洋紅底藍字</translation>
@@ -145,16 +109,12 @@
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>快速編輯</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">編輯</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>左</translation>
@@ -189,16 +149,12 @@
     </message>
     <message>
         <source>Use Beep</source>
         <translation>使用嗶聲</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">索引標籤在頂端</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/fifteen.ts b/i18n/zh_TW/fifteen.ts
index d8e5cac..240b012 100644
--- a/i18n/zh_TW/fifteen.ts
+++ b/i18n/zh_TW/fifteen.ts
@@ -57,16 +57,12 @@
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>隨機</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">解決</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>十五片</translation>
diff --git a/i18n/zh_TW/formatter.ts b/i18n/zh_TW/formatter.ts
index a5ae168..512e7ee 100644
--- a/i18n/zh_TW/formatter.ts
+++ b/i18n/zh_TW/formatter.ts
@@ -19,22 +19,12 @@
     </message>
     <message>
         <source>Main</source>
         <translation>主要</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">警告:
-改變這一頁的參數
-可能造成您的系統
-停止正常功能!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>編輯 fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>檢查磁碟</translation>
@@ -49,33 +39,17 @@ to stop functioning properly!!</source>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">格式化?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>確定要格式化</translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-為 </translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete"> 檔案系統?!?
-您將會失去所有的資料!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
@@ -124,38 +98,24 @@ Device is busy!</source>
         <source>
 has been successfully formatted.</source>
         <translation>
 已經成功地格式化.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">正在嘗試掛載.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>掛載記憶卡失敗!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-已經成功地掛載.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>您現在可以關閉輸出視窗.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>內部的</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">儲存類型 : </translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>總計: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/go.ts b/i18n/zh_TW/go.ts
index 74dc89e..48487d9 100644
--- a/i18n/zh_TW/go.ts
+++ b/i18n/zh_TW/go.ts
@@ -45,12 +45,8 @@
         <translation>I pass</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisoner: 黑 %1, 白 %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">圍棋</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/kbill.ts b/i18n/zh_TW/kbill.ts
index 817fff1..8efdba1 100644
--- a/i18n/zh_TW/kbill.ts
+++ b/i18n/zh_TW/kbill.ts
@@ -31,16 +31,12 @@
     </message>
     <message>
         <source>Pause Game</source>
         <translation>暫停遊戲</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;故事&lt;/b&gt;這個世界的命運又再度掌握在你的手裡! 有一個邪惡的電腦駭客, 只知道他的代號是 &apos;Bill&apos;, 已經製造了一種終極的電腦病毒. 這個病毒的威力十分強大, 甚至可以把一般的電腦變成一臺烤麵包機. (噢!) &apos;Bill&apos; 已經把自己複製成多得數不清的微型比爾. 他們唯一的目的就是要散佈這個凶惡的病毒, 而它已經被巧妙地偽裝成一個非常熱門的作業系統. 身為系統管理者與病毒剋星, 你的工作是阻止比爾完成他的野心.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>K比爾的故事</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>K比爾的規則</translation>
diff --git a/i18n/zh_TW/keypebble.ts b/i18n/zh_TW/keypebble.ts
index e438475..282e79a 100644
--- a/i18n/zh_TW/keypebble.ts
+++ b/i18n/zh_TW/keypebble.ts
@@ -26,16 +26,12 @@ connection.</source>
         <translation>QSocket 回報了無效的錯誤代碼</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">等候伺服器初始化...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>等候桌面名稱...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>連線到 %1</translation>
diff --git a/i18n/zh_TW/libbatteryapplet.ts b/i18n/zh_TW/libbatteryapplet.ts
index 32dbd40..eb39923 100644
--- a/i18n/zh_TW/libbatteryapplet.ts
+++ b/i18n/zh_TW/libbatteryapplet.ts
@@ -1,22 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">關閉</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>充電中</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Percentage battery remaining</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>電池狀態:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>良好</translation>
@@ -47,16 +39,12 @@
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>外部電源切斷</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Battery time remaining</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/libliquid.ts b/i18n/zh_TW/libliquid.ts
index 9b4dece..2335328 100644
--- a/i18n/zh_TW/libliquid.ts
+++ b/i18n/zh_TW/libliquid.ts
@@ -1,15 +1,8 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="obsolete">透明</translation>
-    </message>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/libopiepim2.ts b/i18n/zh_TW/libopiepim2.ts
index ce08ef9..2614191 100644
--- a/i18n/zh_TW/libopiepim2.ts
+++ b/i18n/zh_TW/libopiepim2.ts
@@ -212,161 +212,12 @@ and </source>
     <message>
         <source>Every</source>
         <translation type="unfinished">每</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Repeating Event</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">無</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">日</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">星期</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">月份</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">年份</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">每:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">重復的</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">End On:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">No End Date</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">在某天重復</translation>
-    </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>Every</source>
-        <translation type="obsolete">每</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">No End Date</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">在某天重復</translation>
-    </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>
diff --git a/i18n/zh_TW/libopieui2.ts b/i18n/zh_TW/libopieui2.ts
index e39ee18..a07dfeb 100644
--- a/i18n/zh_TW/libopieui2.ts
+++ b/i18n/zh_TW/libopieui2.ts
@@ -1,142 +1,8 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Repeating Event</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">無</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">日</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">星期</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">月份</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">年份</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">每:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">重復的</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">End On:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">No End Date</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">在某天重復</translation>
-    </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>Every</source>
-        <translation type="obsolete">每</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">No End Date</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">在某天重復</translation>
-    </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>Time:</translation>
     </message>
     <message>
@@ -279,16 +145,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Every</source>
-        <translation type="obsolete">每</translation>
-    </message>
-    <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index dbf0748..17c66bf 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -191,16 +191,12 @@ editing categories.</source>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>找不到字串.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">到達結尾, 從開頭處找起</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -449,20 +445,12 @@ before entering data</source>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>無法排程警示.
 請釋放一些記憶體並再試一次.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
         <source>day</source>
         <translation>日</translation>
@@ -509,18 +497,12 @@ Free some memory and try again.</source>
     </message>
     <message>
         <source>Sun</source>
         <translation>日</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">您確定要刪除
- %1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
@@ -787,32 +769,12 @@ Free some memory and try again.</source>
     </message>
     <message>
         <source>New Document</source>
         <translation>新增文件</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">按這裡關閉這個視窗, 放棄所做的變更.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">按這裡關閉視窗.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">按這裡關閉視窗並接受所有的變更.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">按這裡讓這個視窗可以移動.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished">&lt;QT&gt;泛用說明無法用於這個應用程式, 不過還有內容感應式說明.&lt;p&gt;要使用內容感應式說明:&lt;p&gt;&lt;ol&gt;&lt;li&gt;按住並停留在說明按鈕上.&lt;li&gt;當標題列顯示 &lt;b&gt;這是什麼...&lt;/b&gt; 時, 按一下任何控制元.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished">這是什麼...</translation>
@@ -868,16 +830,12 @@ Free some memory and try again.</source>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">錯誤</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">D</translation>
     </message>
     <message>
         <source>M</source>
diff --git a/i18n/zh_TW/libwlan.ts b/i18n/zh_TW/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/zh_TW/libwlan.ts
+++ b/i18n/zh_TW/libwlan.ts
@@ -1,73 +1,63 @@
 <!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>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,85 +71,78 @@
     </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>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/zh_TW/mindbreaker.ts b/i18n/zh_TW/mindbreaker.ts
index f854a91..f6e9662 100644
--- a/i18n/zh_TW/mindbreaker.ts
+++ b/i18n/zh_TW/mindbreaker.ts
@@ -14,24 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">到%1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">目前到%1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">答案%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>重設統計資料</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>要重設勝率?</translation>
diff --git a/i18n/zh_TW/minesweep.ts b/i18n/zh_TW/minesweep.ts
index d8ed5ac..8b5805d 100644
--- a/i18n/zh_TW/minesweep.ts
+++ b/i18n/zh_TW/minesweep.ts
@@ -7,16 +7,12 @@
     </message>
     <message>
         <source>You exploded!</source>
         <translation>你爆了!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">採地雷</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>初學</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
diff --git a/i18n/zh_TW/opie-eye.ts b/i18n/zh_TW/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/zh_TW/opie-eye.ts
+++ b/i18n/zh_TW/opie-eye.ts
@@ -22,12 +22,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
@@ -53,12 +57,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
@@ -203,12 +215,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
@@ -259,12 +283,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/opie-login.ts b/i18n/zh_TW/opie-login.ts
index de40df3..375c2aa 100644
--- a/i18n/zh_TW/opie-login.ts
+++ b/i18n/zh_TW/opie-login.ts
@@ -4,16 +4,12 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>確實而精準地點一下十字準線, 
 以便校正您的螢幕.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">歡迎使用 Opie</translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>登入</translation>
@@ -47,41 +43,24 @@ accurately to calibrate your screen.</source>
     </message>
     <message>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>錯誤的密碼</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>輸入的密碼不正確.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">OPIE 被沒有抓到的信號
-(%1) 
-中止了</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>失敗</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">無法啟動 OPIE.</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>無法切換為新的使用者身分</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
diff --git a/i18n/zh_TW/opie-sheet.ts b/i18n/zh_TW/opie-sheet.ts
index 3658300..3a3340b 100644
--- a/i18n/zh_TW/opie-sheet.ts
+++ b/i18n/zh_TW/opie-sheet.ts
@@ -201,36 +201,16 @@
     </message>
     <message>
         <source>Save &amp;As</source>
         <translation>另存新檔(&amp;A)</translation>
     </message>
     <message>
-        <source>Quit</source>
-        <translation type="obsolete">離開</translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="obsolete">離開(&amp;Q)</translation>
-    </message>
-    <message>
-        <source>General Help</source>
-        <translation type="obsolete">一般說明</translation>
-    </message>
-    <message>
-        <source>&amp;General</source>
-        <translation type="obsolete">一般(&amp;G)</translation>
-    </message>
-    <message>
         <source>About Opie Sheet</source>
         <translation>關於 Opie 試算表</translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete">關於(&amp;A)</translation>
-    </message>
-    <message>
         <source>Accept</source>
         <translation>套用</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>套用(&amp;A)</translation>
@@ -497,16 +477,12 @@
     </message>
     <message>
         <source>&amp;Data</source>
         <translation>資料(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation type="obsolete">說明(&amp;H)</translation>
-    </message>
-    <message>
         <source>&amp;Row</source>
         <translation>列(&amp;R)</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
         <translation>欄(&amp;N)</translation>
@@ -517,184 +493,16 @@
     </message>
     <message>
         <source>&amp;Function</source>
         <translation>函數(&amp;F)</translation>
     </message>
     <message>
-        <source>&amp;Standard</source>
-        <translation type="obsolete">標準(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="obsolete">總和</translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="obsolete">總和(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="obsolete">絕對值</translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="obsolete">絕對(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="obsolete">正弦</translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="obsolete">正弦(&amp;N)</translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="obsolete">反正弦</translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="obsolete">反正弦(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="obsolete">餘弦</translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="obsolete">餘弦(&amp;C)</translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="obsolete">反餘弦</translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="obsolete">反餘弦(&amp;I)</translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="obsolete">正切</translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="obsolete">正切(&amp;T)</translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="obsolete">反正切</translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="obsolete">反正切(&amp;G)</translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="obsolete">座標的反正切</translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="obsolete">座標反正切(&amp;O)</translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="obsolete">指數</translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="obsolete">指數(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="obsolete">對數</translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="obsolete">對數(&amp;L)</translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="obsolete">乘冪</translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="obsolete">乘冪(&amp;P)</translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="obsolete">數學的(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete">平均數</translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="obsolete">平均數(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="obsolete">最大值</translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="obsolete">最大值(&amp;X)</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="obsolete">最小值</translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="obsolete">最小值(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="obsolete">計數</translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="obsolete">計數(&amp;C)</translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="obsolete">統計(&amp;S)</translation>
-    </message>
-    <message>
         <source>Functions</source>
         <translation>函數</translation>
     </message>
     <message>
-        <source>Help file not found!</source>
-        <translation type="obsolete">找不到說明檔!</translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="obsolete">Opie 試算表
-Opie 的試算表軟體
-QWDC Beta Winner (以 Sheet/Qt)
-
-開發者: Serdar Ozler
-釋出版本 1.0.1
-釋出日期: 七月 04, 2002
-
-這個產品是依 GPL 授權. 它可以自由地散佈. 如果您想要取得最新的版本和原始碼, 請參觀下列網站.
-
-http://qtopia.sitebest.com</translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation>列數(&amp;N):</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>欄數(&amp;N):</translation>
@@ -1150,16 +958,12 @@ http://qtopia.sitebest.com</source>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <source>Syntax error!</source>
-        <translation type="obsolete">語法錯誤!</translation>
-    </message>
-    <message>
         <source>Search key not found!</source>
         <translation>找不到搜尋的目標!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
diff --git a/i18n/zh_TW/opiemail.ts b/i18n/zh_TW/opiemail.ts
index 92df329..7742719 100644
--- a/i18n/zh_TW/opiemail.ts
+++ b/i18n/zh_TW/opiemail.ts
@@ -1,23 +1,8 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="obsolete">回覆</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="obsolete">回覆給所有人</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">刪除</translation>
-    </message>
-</context>
-<context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -179,51 +164,12 @@
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="obsolete">表單1</translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="obsolete">副本</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="obsolete">主旨</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">取消</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="obsolete">重設</translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="obsolete">佇列</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="obsolete">傳送</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="obsolete">寄件者:</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="obsolete">收件者:</translation>
-    </message>
-</context>
-<context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -331,39 +277,12 @@
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">檢視</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="obsolete">撰寫</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">設定值</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="obsolete">郵件</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="obsolete">信件匣</translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="obsolete">設定 Opie郵件</translation>
-    </message>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
     </message>
     <message>
@@ -411,12 +330,64 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">日期</translation>
     </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished">伺服器</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished">資料夾</translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
@@ -570,236 +541,12 @@ with that filter will be listed.</source>
     <message>
         <source>Edit this mail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="obsolete">Opie郵件 組態</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="obsolete">資料夾</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="obsolete">新增(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="obsolete">修改(&amp;M)</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">刪除(&amp;D)</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="obsolete">資料夾名稱</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="obsolete">身分識別</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="obsolete">傳輸</translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="obsolete">輸入</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">名稱</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="obsolete">資料夾</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="obsolete">使用者</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="obsolete">伺服器</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">通訊協定</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="obsolete">輸出</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="obsolete">刪除信件匣</translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="obsolete">刪除此信件匣?
-所有的郵件都會被刪除.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="obsolete">Opie郵件 資料夾組態</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="obsolete">描述:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">名稱:</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="obsolete">Opie郵件 身分識別 - 組態</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="obsolete">簽名檔:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="obsolete">身分識別:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">名稱:</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="obsolete">組織:</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="obsolete">電子郵件:</translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="obsolete">回覆給</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="obsolete">用於傳送</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="obsolete">Open郵件輸入</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">名稱:</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="obsolete">伺服器:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">通訊協定</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="obsolete">目的資料夾</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">使用者名稱:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">密碼</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="obsolete">連接埠</translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="obsolete">110</translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="obsolete">啟用郵件通知.</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="obsolete">檢查於每:</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="obsolete"> 分鐘</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="obsolete">當刪除本機郵件時也將它從伺服器上刪除(&amp;D).</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="obsolete">保留伺服器上的郵件(&amp;K)</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="obsolete">Opie郵件輸出</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">名稱:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">通訊協定</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="obsolete">伺服器:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">使用者名稱:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">密碼</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="obsolete">伺服器需要驗證</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="obsolete">連接埠</translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="obsolete">25</translation>
-    </message>
-</context>
-<context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -845,43 +592,12 @@ All mails will be deleted.</source>
     <message>
         <source> kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="obsolete">主旨</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="obsolete">收件者</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="obsolete">寄件者</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">日期</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="obsolete">(重新)編輯</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="obsolete">複製到</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="obsolete">移動到</translation>
-    </message>
-</context>
-<context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -995,28 +711,18 @@ All mails will be deleted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="obsolete">表單1</translation>
-    </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished">表單1</translation>
+        <source>Click opens mail</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
@@ -1072,12 +778,20 @@ All mails will be deleted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
@@ -1115,12 +829,16 @@ All mails will be deleted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index f6f659a..b9504e1 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -46,28 +46,16 @@
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>原子半徑</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">游離能</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>密度</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">沸點</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">熔點</translation>
-    </message>
-    <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
diff --git a/i18n/zh_TW/patience.ts b/i18n/zh_TW/patience.ts
index 9137dc9..3486b43 100644
--- a/i18n/zh_TW/patience.ts
+++ b/i18n/zh_TW/patience.ts
@@ -11,20 +11,12 @@
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;遊戲</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;改變花色</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;自動定位</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;設定</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;關於</translation>
@@ -35,32 +27,16 @@
     </message>
     <message>
         <source>Play</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">改變花色</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">自動定位</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">翻一張牌</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">翻三張牌</translation>
-    </message>
-    <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 932ee0c..e298e77 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -63,85 +63,18 @@
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">應用程式問題</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">請按下十字架中心以校正觸控筆</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">歡迎進入Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">文件</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">圖示瀏覽</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">列表瀏覽</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">低電量警告! 
-請把電源關掉直到插上插座</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">低電量</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">低電量警告.
-請換上備份電池</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">business card </translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">訊息</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">電池狀態</translation>
@@ -235,20 +168,12 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 檔案</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">所有類型檔案</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">文件瀏覽</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
@@ -263,67 +188,12 @@ Please charge the back-up battery.</source>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">中間插入</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Which media files</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">音效</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">圖形</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">文字</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">影像</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">所有</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">連結程式</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Limit search to dir: (not used yet)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">加入</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">你的決定將存在儲存媒体當中</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">不再詢問這一個儲存媒体</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -369,19 +239,12 @@ Please charge the back-up battery.</source>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">電池狀態</translation>
-    </message>
-</context>
-<context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -421,24 +284,12 @@ Please charge the back-up battery.</source>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">低電量警告! 
-請把電源關掉直到插上插座</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">低電量警告.
-請換上備份電池</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished">business card </translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
@@ -511,18 +362,12 @@ immediately.</source>
     </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="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>
@@ -532,16 +377,12 @@ These termination options are provided primarily for use while developing and te
     <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>
@@ -559,24 +400,12 @@ These termination options are provided primarily for use while developing and te
         <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>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index c3bdeac..6a1139b 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -71,36 +71,12 @@ You can only select an actually configured user.</source>
     </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>
@@ -187,140 +163,12 @@ You can only select an actually configured user.</source>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">設定通行碼</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">改變通行碼</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">輸入通行碼</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">通行碼不正確</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">輸入的通行碼不正確.
-存取已拒絕</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">任何</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">無</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">輸入新的通行碼</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">重新輸入新的通行碼</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>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">安全性設定</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">改變通行碼</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">清除通行碼</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">在電源開啟時要求輸入通行碼</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">同步化</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">允許來自網路的同步化:</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>Any</source>
-        <translation type="obsolete">任何</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">無</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</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>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/snake.ts b/i18n/zh_TW/snake.ts
index 71f7d83..d2ed62f 100644
--- a/i18n/zh_TW/snake.ts
+++ b/i18n/zh_TW/snake.ts
@@ -18,30 +18,22 @@
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>使用方向鍵以控制蛇去吃老鼠
 不能碰到牆.蛋或是他的尾巴</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">按任意鍵以開始</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>     分數 :    %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>GAME OVER!
  你的得分: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">按任意鍵以開始新遊戲</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/sysinfo.ts b/i18n/zh_TW/sysinfo.ts
index fa5b4d4..983bd63 100644
--- a/i18n/zh_TW/sysinfo.ts
+++ b/i18n/zh_TW/sysinfo.ts
@@ -148,28 +148,12 @@
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>總記憶體： %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">本頁顯示裝置些記憶體分配情形
-記憶體使用分類如下：
-
-1. 已使用 - 由Opie及執行的程式所佔用
-2. 緩衝區 - 用來提升系統效能的暫存區
-3. 快取區 - 最近使用過但尚未清除的資訊
-4. 剩餘 - 未被Opie或任何執行程式佔用的記憶體</translation>
-    </message>
-    <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
@@ -193,16 +177,12 @@ Memory is categorized as follows:
     </message>
     <message>
         <source>Use#</source>
         <translation>Use#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">使用者</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>這是現在已載入系統的所有核心模組的清單
 
 點住模組名稱不放即可顯示詳細資訊或卸載該模組</translation>
@@ -221,17 +201,12 @@ Click and hold on a module to see additional information about the module, or to
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>本區顯示模組的詳細資訊</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">您確定要執行？</translation>
-    </message>
-    <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
@@ -293,17 +268,12 @@ Click and hold on a process to see additional information about the process, or
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>本區顯示選取程序的詳細資料</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">您確定要送出？</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -365,20 +335,12 @@ to this process?</source>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;版本: </translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation type="obsolete">&lt;p&gt;型號: </translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <translation type="obsolete">&lt;p&gt;提供者: </translation>
-    </message>
-    <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>本頁顯示本裝置上執行的Opie, Linux核心版及發行套件名稱</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/tableviewer.ts b/i18n/zh_TW/tableviewer.ts
index 169890e..4f83fb5 100644
--- a/i18n/zh_TW/tableviewer.ts
+++ b/i18n/zh_TW/tableviewer.ts
@@ -1,19 +1,8 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() 無法設定預設值 %1, Key not added.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) No valid type found</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>重設</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index f941791..cfea525 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -151,18 +151,12 @@
     </message>
     <message>
         <source>Choose font</source>
         <translation type="unfinished">選擇字型</translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished">是的</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished">否</translation>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index daa3839..59b9741 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -11,16 +11,12 @@
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>請填入個人名片資料</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation type="obsolete">找不到plugins</translation>
-    </message>
-    <message>
         <source>No plugins activated</source>
         <translation>plugins未啟動</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>按此處啟動聯結的應用程式</translation>
@@ -65,60 +61,16 @@
     </message>
     <message>
         <source>active/order</source>
         <translation>啟動/順序</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">Resume後
-        自動啟動？
-        (OPie only)</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">休眠分鐘數</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>其他</translation>
     </message>
     <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">打勾開啟喚醒時自動啟動「今日」功能</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">圖示大小</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">設定圖示的像素點數</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">更新內容</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">「今日」多久自動更新一次內容</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">秒</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">永不</translation>
-    </message>
-    <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>勾選要啟動的plugins，並用右側的上下箭頭來調整顯示順序</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 2d3a617..7d01365 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -86,52 +86,16 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">利用樣板建立新事項</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">新增待辦事項</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">編輯待辦事項</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">檢視待辦事項</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">刪除...</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">刪除全部....</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation type="unfinished">刪除已完成事項</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">複製事項</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="obsolete">傳送資料</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">搜尋</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
@@ -142,24 +106,12 @@
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">資料管理</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">分類目錄</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">設定選項</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
@@ -168,20 +120,12 @@ The list displays the following information:
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">全部目錄</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">未分類的</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished">空間不足</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
@@ -193,16 +137,12 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">待辦事項</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="obsolete">正在同步資料中，無法進行編輯</translation>
-    </message>
-    <message>
         <source>all tasks?</source>
         <translation type="unfinished">所有的待辦事項？</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished">所有的已完成事項？</translation>
@@ -225,16 +165,12 @@ Quit Anyway?</source>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">到期日</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">樣板管理</translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation type="unfinished">樣板編輯器</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">新增</translation>
diff --git a/i18n/zh_TW/usermanager.ts b/i18n/zh_TW/usermanager.ts
index 111e5ae..8f54a49 100644
--- a/i18n/zh_TW/usermanager.ts
+++ b/i18n/zh_TW/usermanager.ts
@@ -10,16 +10,12 @@
         <translation>編輯群組</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">OPIE 使用者管理員</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
diff --git a/i18n/zh_TW/zsafe.ts b/i18n/zh_TW/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/zh_TW/zsafe.ts
+++ b/i18n/zh_TW/zsafe.ts
@@ -1,219 +1,8 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-</context>
-<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
@@ -415,23 +204,12 @@ shows the list of dirs and files</source>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
@@ -506,24 +284,12 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
@@ -550,28 +316,20 @@ ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
@@ -694,52 +452,28 @@ sichern</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>