3 files changed, 470 insertions, 126 deletions

diff --git a/i18n/zh_TW/libopiepim2.ts b/i18n/zh_TW/libopiepim2.ts
index adc8c7a..ed195b6 100644
--- a/i18n/zh_TW/libopiepim2.ts
+++ b/i18n/zh_TW/libopiepim2.ts
@@ -1,627 +1,800 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+</context>
+<context>
+    <name>OColorDialog</name>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+</context>
+<context>
+    <name>OFileDialog</name>
+</context>
+<context>
+    <name>OFileSelector</name>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Repeating Event</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">無</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">日</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期</translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">月份</translation>
     </message>
     <message>
         <source>Year</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">年份</translation>
     </message>
     <message>
         <source>Every:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">每:</translation>
     </message>
     <message>
         <source>Frequency</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">重復的</translation>
     </message>
     <message>
         <source>End On:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">End On:</translation>
     </message>
     <message>
         <source>No End Date</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No End Date</translation>
     </message>
     <message>
         <source>Repeat On</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期日</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">每</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No End Date</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">星期日</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">日</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
-        <translation type="unfinished"></translation>
+        <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>QObject</name>
     <message>
-        <source>Default Email: </source>
+        <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories</source>
+        <source>Start:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>End:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>First Name</source>
+        <source>Note:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
+        <source>Every</source>
+        <translation type="unfinished">每</translation>
     </message>
     <message>
-        <source>Last Name</source>
+        <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suffix</source>
+        <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
+        <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Job Title</source>
+        <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Department</source>
+        <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Company</source>
+        <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Phone</source>
+        <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Fax</source>
+        <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Mobile</source>
+        <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Email</source>
+        <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emails</source>
+        <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Phone</source>
+        <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Fax</source>
+        <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Mobile</source>
+        <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
+        <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business City</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business State</source>
+        <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Zip</source>
+        <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Country</source>
+        <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Pager</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business WebPage</source>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Office</source>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Profession</source>
+        <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Assistant</source>
+        <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manager</source>
+        <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Street</source>
+        <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home City</source>
+        <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home State</source>
+        <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Zip</source>
+        <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Country</source>
+        <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Web Page</source>
+        <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Spouse</source>
+        <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
+        <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Birthday</source>
+        <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Anniversary</source>
+        <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname</source>
+        <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Children</source>
+        <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Very high</source>
+        <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>High</source>
+        <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
+        <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Low</source>
+        <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Very low</source>
+        <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline:</source>
+        <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Location:</source>
+        <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an all day event</source>
+        <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is a multiple day event</source>
+        <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start:</source>
+        <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End:</source>
+        <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note:</source>
+        <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Every</source>
+        <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 %2 every </source>
+        <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The %1 every </source>
+        <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The %1 %2 of every</source>
+        <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Every </source>
+        <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Monday</source>
+        <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tuesday</source>
+        <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wednesday</source>
+        <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Thursday</source>
+        <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Friday</source>
+        <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Saturday</source>
+        <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sunday</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopieui2.ts b/i18n/zh_TW/libopieui2.ts
index 67b8f28..635eaa8 100644
--- a/i18n/zh_TW/libopieui2.ts
+++ b/i18n/zh_TW/libopieui2.ts
@@ -1,163 +1,322 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+</context>
+<context>
+    <name>OColorDialog</name>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+</context>
+<context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OFileSelector</name>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>ORecurranceBase</name>
     <message>
-        <source>OTimePickerDialogBase</source>
-        <translation type="unfinished"></translation>
+        <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="unfinished"></translation>
+        <translation>Time:</translation>
     </message>
     <message>
         <source>:</source>
-        <translation type="unfinished"></translation>
+        <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
+        <translation>Pick Time:</translation>
+    </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
+        <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>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">無</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
 </context>
 </TS>
diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index 38a07db..09ab791 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -1,134 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>計算</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>分子量</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>化學式</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>分子量 (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>元素成分 (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>區塊</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>群</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>電負度</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>原子半徑</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
-        <translation>游離能</translation>
+        <translation type="obsolete">游離能</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>密度</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
-        <translation>沸點</translation>
+        <translation type="obsolete">沸點</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
-        <translation>熔點</translation>
+        <translation type="obsolete">熔點</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ionization Energy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Boiling point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Melting point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>資料</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>計算結果</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished">氫</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished">氦</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished">鋰</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished">鈹</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished">硼</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished">碳</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished">氮</translation>
     </message>
     <message>