9 files changed, 583 insertions, 59 deletions

diff --git a/i18n/xx/advancedfm.ts b/i18n/xx/advancedfm.ts
index 43e7e04..f6d596f 100644
--- a/i18n/xx/advancedfm.ts
+++ b/i18n/xx/advancedfm.ts
@@ -14,347 +14,363 @@
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>FOO</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>FOO</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> kB free</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">FOO</translation>
     </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>read</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>write</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/calculator.ts b/i18n/xx/calculator.ts
index e0dde8d..32ea1ae 100644
--- a/i18n/xx/calculator.ts
+++ b/i18n/xx/calculator.ts
@@ -40,97 +40,296 @@
     <message>
         <source>sin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>3</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>6</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>=</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>x</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>FOO</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index 1ef712c..f93ea2a 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -271,384 +271,388 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fr</source>
         <comment>Friday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sa</source>
         <comment>Saturday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Su</source>
         <comment>Sunday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation>FOO</translation>
     </message>
diff --git a/i18n/xx/libbatteryapplet.ts b/i18n/xx/libbatteryapplet.ts
index 9bf2d04..e888b0a 100644
--- a/i18n/xx/libbatteryapplet.ts
+++ b/i18n/xx/libbatteryapplet.ts
@@ -1,85 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Close</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Battery status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libqpe.ts b/i18n/xx/libqpe.ts
index 49fb921..ceb3ad5 100644
--- a/i18n/xx/libqpe.ts
+++ b/i18n/xx/libqpe.ts
@@ -758,187 +758,203 @@ Free some memory and try again.</source>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>FOO</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>FOO</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/mailit.ts b/i18n/xx/mailit.ts
index 90d63e6..8833351 100644
--- a/i18n/xx/mailit.ts
+++ b/i18n/xx/mailit.ts
@@ -107,192 +107,205 @@
         <source>Cancel transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>From</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>getMail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>select account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login failed
 Check user name and password&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Receiving error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mailit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Read Mail</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> new messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>DNS lookup</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
diff --git a/i18n/xx/opieftp.ts b/i18n/xx/opieftp.ts
index f57b6e9..ed51ce6 100644
--- a/i18n/xx/opieftp.ts
+++ b/i18n/xx/opieftp.ts
@@ -138,98 +138,102 @@
     <message>
         <source>Unable to upload
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index 3952e55..912f512 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -1,252 +1,482 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</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>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">FOO</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="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</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>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</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>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</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>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/showimg.ts b/i18n/xx/showimg.ts
index 9c6673d..f81d86d 100644
--- a/i18n/xx/showimg.ts
+++ b/i18n/xx/showimg.ts
@@ -28,131 +28,161 @@
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>s</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>