3 files changed, 161 insertions, 101 deletions

diff --git a/i18n/en/libopiepim2.ts b/i18n/en/libopiepim2.ts
index adc8c7a..e28b5bb 100644
--- a/i18n/en/libopiepim2.ts
+++ b/i18n/en/libopiepim2.ts
@@ -1,18 +1,42 @@
 <!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>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
@@ -202,70 +226,87 @@ and </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>
     </message>
 </context>
 <context>
+    <name>ORecurranceBase</name>
+</context>
+<context>
+    <name>ORecurranceWidget</name>
+</context>
+<context>
+    <name>OTimePickerDialogBase</name>
+</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>
@@ -304,317 +345,309 @@ and </source>
         <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>
+        <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>
diff --git a/i18n/en/libopieui2.ts b/i18n/en/libopieui2.ts
index 67b8f28..eb54f7a 100644
--- a/i18n/en/libopieui2.ts
+++ b/i18n/en/libopieui2.ts
@@ -1,33 +1,51 @@
 <!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>
@@ -84,80 +102,89 @@
         <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>ORecurranceBase</name>
+</context>
+<context>
+    <name>ORecurranceWidget</name>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>OTimePickerDialogBase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></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>
-    </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/en/oxygen.ts b/i18n/en/oxygen.ts
index c0003ef..95ea62e 100644
--- a/i18n/en/oxygen.ts
+++ b/i18n/en/oxygen.ts
@@ -32,69 +32,69 @@
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
+        <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Density</source>
+        <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
+        <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Meltingpoint</source>
+        <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 u</source>
+        <source>%1 pm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 J</source>
+        <source>%1 g/cm^3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 K</source>
+        <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 pm</source>
+        <source>Ionization Energy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 g/cm^3</source>
+        <source>Boiling point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Weight</source>
+        <source>Melting point</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>