21 files changed, 274 insertions, 145 deletions
diff --git a/i18n/en/bluepin.ts b/i18n/en/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/en/bluepin.ts
+++ b/i18n/en/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/bluetooth-manager.ts b/i18n/en/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/en/bluetooth-manager.ts
+++ b/i18n/en/bluetooth-manager.ts
@@ -13,79 +13,71 @@
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -100,94 +92,92 @@
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bluetooth Basic Config</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DeviceDialog</name>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/calculator.ts b/i18n/en/calculator.ts
index d142fcc..db98fc2 100644
--- a/i18n/en/calculator.ts
+++ b/i18n/en/calculator.ts
@@ -147,60 +147,52 @@
         <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>
@@ -314,18 +306,26 @@
     <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>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/checkbook.ts b/i18n/en/checkbook.ts
index 4bf1fcb..53b29b9 100644
--- a/i18n/en/checkbook.ts
+++ b/i18n/en/checkbook.ts
@@ -302,32 +302,40 @@ protected</source>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index 9fc7a8b..5d7e329 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -500,67 +500,75 @@ Quit anyway?</source>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
diff --git a/i18n/en/embeddedkonsole.ts b/i18n/en/embeddedkonsole.ts
index 8ceb4ac..a5a1f2d 100644
--- a/i18n/en/embeddedkonsole.ts
+++ b/i18n/en/embeddedkonsole.ts
@@ -214,32 +214,36 @@
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
diff --git a/i18n/en/go.ts b/i18n/en/go.ts
index ef2a60d..e34ea4b 100644
--- a/i18n/en/go.ts
+++ b/i18n/en/go.ts
@@ -8,32 +8,36 @@
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/gutenbrowser.ts b/i18n/en/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/en/gutenbrowser.ts
+++ b/i18n/en/gutenbrowser.ts
@@ -272,52 +272,51 @@ http://www.trolltech.com
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/libaboutapplet.ts b/i18n/en/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/en/libaboutapplet.ts
+++ b/i18n/en/libaboutapplet.ts
@@ -48,28 +48,29 @@ Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the O
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libbatteryapplet.ts b/i18n/en/libbatteryapplet.ts
index 83f77d4..2976e72 100644
--- a/i18n/en/libbatteryapplet.ts
+++ b/i18n/en/libbatteryapplet.ts
@@ -61,26 +61,27 @@
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libliquid.ts b/i18n/en/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/en/libliquid.ts
+++ b/i18n/en/libliquid.ts
@@ -1,18 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/libmemoryapplet.ts b/i18n/en/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/en/libmemoryapplet.ts
+++ b/i18n/en/libmemoryapplet.ts
@@ -143,18 +143,22 @@ Memory is categorized as follows:
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/libopiecore2.ts b/i18n/en/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/en/libopiecore2.ts
+++ b/i18n/en/libopiecore2.ts
@@ -72,25 +72,29 @@
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libopieobex.ts b/i18n/en/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/en/libopieobex.ts
+++ b/i18n/en/libopieobex.ts
@@ -8,69 +8,96 @@
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libscreenshotapplet.ts b/i18n/en/libscreenshotapplet.ts
index ded2f36..b32ed89 100644
--- a/i18n/en/libscreenshotapplet.ts
+++ b/i18n/en/libscreenshotapplet.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/libtodaydatebookplugin.ts b/i18n/en/libtodaydatebookplugin.ts
index 30c2a58..d08976a 100644
--- a/i18n/en/libtodaydatebookplugin.ts
+++ b/i18n/en/libtodaydatebookplugin.ts
@@ -1,31 +1,35 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -55,32 +59,36 @@
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/odict.ts b/i18n/en/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/en/odict.ts
+++ b/i18n/en/odict.ts
@@ -24,67 +24,67 @@
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/opieirc.ts b/i18n/en/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/en/opieirc.ts
+++ b/i18n/en/opieirc.ts
@@ -369,32 +369,36 @@ Real name: %4</source>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -469,34 +473,35 @@ Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
-comma separated list of channel
- names which start with either &apos;#&apos; or &apos;+&apos;</source>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/sysinfo.ts b/i18n/en/sysinfo.ts
index 10f2b46..3990448 100644
--- a/i18n/en/sysinfo.ts
+++ b/i18n/en/sysinfo.ts
@@ -98,48 +98,32 @@
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -214,32 +198,43 @@ Click and hold on a module to see additional information about the module, or to
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
@@ -274,55 +269,55 @@ to this process?</source>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/today.ts b/i18n/en/today.ts
index 5d7b39b..589d4f6 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -24,37 +24,37 @@
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to get to the config dialog</source>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/zsafe.ts b/i18n/en/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/en/zsafe.ts
+++ b/i18n/en/zsafe.ts
@@ -195,105 +195,105 @@ shows the list of dirs and files</source>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
@@ -443,63 +443,47 @@ sichern</translation>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -534,33 +518,81 @@ newly created document.</source>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>