updates after opie-lupdate

120 files changed, 5233 insertions, 1658 deletions

diff --git a/i18n/da/aqpkg.ts b/i18n/da/aqpkg.ts
index 5dec587..3adc940 100644
--- a/i18n/da/aqpkg.ts
+++ b/i18n/da/aqpkg.ts
@@ -1,547 +1,590 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished">Kategori filter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Læser konfiguration...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Afbryd</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished">Ledig plads</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">Output</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">--force-depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakkestyring</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Indtast teksten du vil søge efter her.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klik her for at gemme Quick Jump værktøjslinien.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Opdatér lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klik her for at opdatere pakke lister fra serverne.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Opgradér</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klik her for at opgradere alle installerede pakker, hvis en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klik her for at hente den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Anvend ændringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klik her for at installere, fjerne eller opgradere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Vis pakker der ikke er installeret</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klik her for at vise de tilgængelige pakker der ikke er installeret.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Vis installerede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klik her for at vise de pakker der er installeret på denne enhed.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Vis opdaterede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klik her for at vise de pakker der er installeret på denne enhed, hvor en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrér efter kategori</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klik her for at vise pakker tilhørende en bestemt kategori.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Vælg filter kategori</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klik her for at ændre den kategori der skal bruges til filteret.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klik her for at søge efter tekst i pakke navnene.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Find næste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klik her for at finde det næste pakke navn indeholdende den tekst du søger efter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump tastplade</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klik her for at vise/skjule tastpladen for hurtig søgning i pakke listen.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurér</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klik her for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klik her for at skjule søge værktøjslinien.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klik her for at vælge et pakke feed.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dette er en liste over alle pakker fra det server feed der er valgt foroven.
 
 En blå prik ved siden af pakke navnet indikerer at pakken allerede er installeret.
 
 En blå prik med en stjerne indikerer at en nyere version af pakken er tilgængelig fra det valgte server feed.
 
 Klik inde i boksen til venstre for at vælge en pakke.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klik her for at afinstallere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bygger server liste:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bygger pakke liste for:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
-        <translation>Installeret på - %1</translation>
+        <translation type="obsolete">Installeret på - %1</translation>
     </message>
     <message>
         <source>Description - %1</source>
-        <translation>Beskrivelse - %1</translation>
+        <translation type="obsolete">Beskrivelse - %1</translation>
     </message>
     <message>
         <source>Size - %1</source>
-        <translation>Størrelse - %1</translation>
+        <translation type="obsolete">Størrelse - %1</translation>
     </message>
     <message>
         <source>Section - %1</source>
-        <translation>Sektion - %1</translation>
+        <translation type="obsolete">Sektion - %1</translation>
     </message>
     <message>
         <source>Filename - %1</source>
-        <translation>Filnavn - %1</translation>
+        <translation type="obsolete">Filnavn - %1</translation>
     </message>
     <message>
         <source>V. Installed - %1</source>
-        <translation>V. installeret - %1</translation>
+        <translation type="obsolete">V. installeret - %1</translation>
     </message>
     <message>
         <source>V. Available - %1</source>
-        <translation>V. tilgængelig - %1</translation>
+        <translation type="obsolete">V. tilgængelig - %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Genopfrisker server pakke lister</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ADVARSEL: Opgradering mens
 Opie/Qtopia kører
 er IKKE anbefalet!
 
 Er du sikker?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Opgraderer installerede pakker</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Er du sikker på du vil slette
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Er du sikker?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Hent hvortil</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Indtast stien der skal hentes til</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installér fjernpakke</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Indtast pakkens lokation</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Intet at lave</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Ingen pakker er valgt</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Vil du fjerne eller geninstallere
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Fjern eller geninstallér</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Geninstallér</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vil du fjerne eller opgradere
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Fjern eller opgradér</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Luk</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">Servere</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished">Destinationer</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">Proxyer</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished">Aktive servere</translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destination</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished">HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">Aktiveret</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished">FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libliquid.ts b/i18n/da/libliquid.ts
index 6adccf5..693ea99 100644
--- a/i18n/da/libliquid.ts
+++ b/i18n/da/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Liquid Stil</translation>
+        <translation type="unfinished">Liquid Stil</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Ingen gennemsigtighed</translation>
+        <translation type="unfinished">Ingen gennemsigtighed</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Stiplet, baggrundsfarve</translation>
+        <translation type="unfinished">Stiplet, baggrundsfarve</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Stiplet, knap farve</translation>
+        <translation type="unfinished">Stiplet, knap farve</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Gennemsigtigt stiplet, baggrundsfarve</translation>
+        <translation type="unfinished">Gennemsigtigt stiplet, baggrundsfarve</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Gennemsigtigt stiplet, knap farve</translation>
+        <translation type="unfinished">Gennemsigtigt stiplet, knap farve</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Brugerdefineret gennemsigtighed</translation>
+        <translation type="unfinished">Brugerdefineret gennemsigtighed</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Menu farve</translation>
+        <translation type="unfinished">Menu farve</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Tekst farve</translation>
+        <translation type="unfinished">Tekst farve</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Uigennemsigtighed</translation>
+        <translation type="unfinished">Uigennemsigtighed</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Vis menu tekst med skygge</translation>
+        <translation type="unfinished">Vis menu tekst med skygge</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Flade knapper på værktøjslinien</translation>
+        <translation type="unfinished">Flade knapper på værktøjslinien</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Stiplet kontrast</translation>
+        <translation type="unfinished">Stiplet kontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Høj ydelses Liquid stil af Mosfet</translation>
+        <translation type="unfinished">Høj ydelses Liquid stil af Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libopieobex.ts b/i18n/da/libopieobex.ts
index 99d06ec..5fda095 100644
--- a/i18n/da/libopieobex.ts
+++ b/i18n/da/libopieobex.ts
@@ -1,49 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
+    <name>OtherHandler</name>
     <message>
-        <source>OBEX Sending</source>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sending:</source>
+        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filename</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <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>ObexInc</name>
+    <name>SendWidget</name>
     <message>
-        <source>OBEX Receiving</source>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filename</source>
+        <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A file was beamed 
-to you.</source>
+        <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
+        <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reject</source>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/opieftp.ts b/i18n/da/opieftp.ts
index aa3a32d..3d03038 100644
--- a/i18n/da/opieftp.ts
+++ b/i18n/da/opieftp.ts
@@ -1,253 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Forbindelse</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Lokal</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Tilslut</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Afbryd</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Vis skjulte filer</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Opret mappe</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Omdøb</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Skift til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Skift til fjern</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Skift til indstillinger</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>Om</translation>
+        <translation type="obsolete">Om</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Mappe</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Kodeord</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Fjern server</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Fjern sti</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Konfig</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Indstil venligst server info</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Kunne ikke tilslutte til
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Kunne ikke logge ind
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Kunne ikke sende
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Kunne ikke sende mapper</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Kunne ikke hente 
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Kunne ikke vise mappen
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Kunne ikke skifte mappe
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Kunne ikke &apos;cd up&apos;
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Kunne ikke hente arbejds mappen
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Skift mappe</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Genindlæs</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Er du sikker på du vil slette
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 Den skal være tom</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Kunne ikke oprette mappe
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Kunne ikke slette mappe
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Kunne ikke slette filen
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Kunne ikke omdøbe filen
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Kunne ikke omdøbe</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Den mappe eksisterer ikke</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Nyt server navn</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Desværre, navnet er allerede brugt</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/qpe.ts b/i18n/da/qpe.ts
index 616c6cf..46c0593 100644
--- a/i18n/da/qpe.ts
+++ b/i18n/da/qpe.ts
@@ -1,249 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Klik præcist midt på krydset
 for at kalibrere din skærm.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Velkommen til Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Dokumenter</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Liste</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Batteri niveauet er kritisk!
 Hold enheden slukket indtil den får strøm igen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>Batteriet er næsten tomt.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>Back-up batteriet er næsten tomt.
 Genoplad venligst back-up batteriet.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>visitkort</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</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>&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Batteri Status</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Intet program</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Der er ikke defineret noget program til dette dokument.&lt;p&gt;Typen er %1.</translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 filer</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Alle typer filer</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokument visning</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Medie indsat</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Et &lt;b&gt;lager medie&lt;/b&gt; blev indsat. Skal det skannes for medie filer?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Billede</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Link programmer</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Begræns søgning til mappe: (ikke ibrug endnu)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>Dit valg vil blive gemt på mediet.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Spørg ikke igen for dette medie</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Luk ned</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Luk Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Genstart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Genstart Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Luk ned</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>&lt;p&gt;
 Disse muligheder er primært givet til brug under udvikling og test af Opie systemet. I et normalt miljø er dette unødvendigt.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Fortryd</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Luk ned...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Synkroniserings-forbindelse</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>&lt;p&gt;Et uautoriseret system ønsker adgang til denne enhed.&lt;p&gt;Hvis du bruger en Qtopia Desktop version ælder end 1.5.1 skal du opgradere.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Afvis</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>&lt;p&gt;Et ukendt system ønsker adgang til denne enhed.&lt;p&gt;Hvis det er første gang du synkroniserer er dette normalt.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Tillad</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Synkroniserer</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Kontakter&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Fortryd</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/security.ts b/i18n/da/security.ts
index abd7ef9..338a8d3 100644
--- a/i18n/da/security.ts
+++ b/i18n/da/security.ts
@@ -1,102 +1,106 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Vælg kode</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Skift kode</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Indtast kode</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koden er forkert</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Den indtastede kode er forkert.
 Adgang nægtet</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Indtast ny kode</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Gentag ny kode</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Sikkerheds Indstillinger</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Skift kode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Slet kode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Spørg efter kode ved opstart</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synkronisering</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Tillad synkronisering fra netværk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (standard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation></translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Beskyttelse med kode giver en minimal sikkerhed mod almindelig adgang til denne enhed.</translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/systemtime.ts b/i18n/da/systemtime.ts
index 4fafff9..521e025 100644
--- a/i18n/da/systemtime.ts
+++ b/i18n/da/systemtime.ts
@@ -1,273 +1,521 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation type="unfinished">Tidsformat</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation type="unfinished">hh:mm</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">D/M hh:mm</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/D hh:mm</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 timer</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation type="unfinished">24 timer</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation type="unfinished">12 timer</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation type="unfinished">Datoformat</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Ugen starter med</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished">Søndag</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished">Mandag</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">Indstillinger</translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished">Forudsig</translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished">Fejl under kørslen af ntpdate</translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"> sekunder</translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished">Kunne ikke forbinde til serveren </translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
-        <translation>time.fu-berlin.de</translation>
+        <translation type="obsolete">time.fu-berlin.de</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>Hovedmenu</translation>
+        <translation type="obsolete">Hovedmenu</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Indstillinger</translation>
+        <translation type="obsolete">Indstillinger</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Forudsig</translation>
+        <translation type="obsolete">Forudsig</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Run NTP?</source>
-        <translation>Kør NTP?</translation>
+        <translation type="obsolete">Kør NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
-        <translation>Kører:</translation>
+        <translation type="obsolete">Kører:</translation>
     </message>
     <message>
         <source>ntp error</source>
-        <translation>NTP Fejl</translation>
+        <translation type="obsolete">NTP Fejl</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
-        <translation>Fejl under forsøget på at
+        <translation type="obsolete">Fejl under forsøget på at
 hente tiden fra netværket!</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation>Fejl under kørslen af ntpdate</translation>
+        <translation type="obsolete">Fejl under kørslen af ntpdate</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
-        <translation>Fejl under forsøget på at hente
+        <translation type="obsolete">Fejl under forsøget på at hente
 tiden fra serveren </translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation> sekunder</translation>
+        <translation type="obsolete"> sekunder</translation>
     </message>
     <message>
         <source>last [h]</source>
-        <translation>sidste [h]</translation>
+        <translation type="obsolete">sidste [h]</translation>
     </message>
     <message>
         <source>offset [s]</source>
-        <translation>offset [s]</translation>
+        <translation type="obsolete">offset [s]</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
-        <translation>forskydning [s/t]</translation>
+        <translation type="obsolete">forskydning [s/t]</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation> s/t</translation>
+        <translation type="obsolete"> s/t</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>Hent tiden fra netværk</translation>
+        <translation type="obsolete">Hent tiden fra netværk</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
-        <translation>Brug forudsagt tid: </translation>
+        <translation type="obsolete">Brug forudsagt tid: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation>Kunne ikke forbinde til serveren </translation>
+        <translation type="obsolete">Kunne ikke forbinde til serveren </translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation>Du bad om en pause på %1 minutter, men kun %2 minutter er gået siden sidste opslag. &lt;br&gt; Kør NTP igen?</translation>
+        <translation type="obsolete">Du bad om en pause på %1 minutter, men kun %2 minutter er gået siden sidste opslag. &lt;br&gt; Kør NTP igen?</translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
-        <translation>Netværks Tid</translation>
+        <translation type="obsolete">Netværks Tid</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>Hovedmenu</translation>
+        <translation type="obsolete">Hovedmenu</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>Hent tiden fra netværket</translation>
+        <translation type="obsolete">Hent tiden fra netværket</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation>Start Tid:</translation>
+        <translation type="obsolete">Start Tid:</translation>
     </message>
     <message>
         <source>nan</source>
-        <translation>-</translation>
+        <translation type="obsolete">-</translation>
     </message>
     <message>
         <source>Time Shift:</source>
-        <translation>Tids forskydning:</translation>
+        <translation type="obsolete">Tids forskydning:</translation>
     </message>
     <message>
         <source>New Time:</source>
-        <translation>Ny Tid:</translation>
+        <translation type="obsolete">Ny Tid:</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Forudsig</translation>
+        <translation type="obsolete">Forudsig</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
-        <translation>Beregnet forskydning:</translation>
+        <translation type="obsolete">Beregnet forskydning:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
-        <translation>Forudsagt tid:</translation>
+        <translation type="obsolete">Forudsagt tid:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
-        <translation>Gennemsnitlig forskydning:</translation>
+        <translation type="obsolete">Gennemsnitlig forskydning:</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation>Brug forudsagt tid</translation>
+        <translation type="obsolete">Brug forudsagt tid</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation>Forudsig tiden</translation>
+        <translation type="obsolete">Forudsig tiden</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Indstillinger</translation>
+        <translation type="obsolete">Indstillinger</translation>
     </message>
     <message>
         <source>Use</source>
-        <translation>Brug</translation>
+        <translation type="obsolete">Brug</translation>
     </message>
     <message>
         <source>as</source>
-        <translation>som</translation>
+        <translation type="obsolete">som</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
-        <translation>NTP serveren klokken skal hentes fra på netværket.</translation>
+        <translation type="obsolete">NTP serveren klokken skal hentes fra på netværket.</translation>
     </message>
     <message>
         <source>Advanced settings</source>
-        <translation>Advancerede indstillinger</translation>
+        <translation type="obsolete">Advancerede indstillinger</translation>
     </message>
     <message>
         <source>Wait for </source>
-        <translation>Vent i </translation>
+        <translation type="obsolete">Vent i </translation>
     </message>
     <message>
         <source>minutes until</source>
-        <translation>minutter indtil</translation>
+        <translation type="obsolete">minutter indtil</translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
-        <translation>NTP prøver at synkronisere uret med netværket.</translation>
+        <translation type="obsolete">NTP prøver at synkronisere uret med netværket.</translation>
     </message>
     <message>
         <source>Insure a delay of</source>
-        <translation>Sæt en pause på</translation>
+        <translation type="obsolete">Sæt en pause på</translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
-        <translation>et nyt NTP opslag vil blive brugt til at forudsige klokken.</translation>
+        <translation type="obsolete">et nyt NTP opslag vil blive brugt til at forudsige klokken.</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation>Manuel</translation>
+        <translation type="obsolete">Manuel</translation>
     </message>
     <message>
         <source>Set time</source>
-        <translation>Indstil tiden</translation>
+        <translation type="obsolete">Indstil tiden</translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished">Forudsig tiden</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">Brug forudsagt tid</translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"> s/t</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"> sekunder</translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>System Time</source>
-        <translation>Dato/Tid</translation>
+        <translation type="obsolete">Dato/Tid</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Dato</translation>
+        <translation type="obsolete">Dato</translation>
     </message>
     <message>
         <source>Time Zone</source>
-        <translation>Tidszone</translation>
+        <translation type="obsolete">Tidszone</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Tidsformat</translation>
+        <translation type="obsolete">Tidsformat</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 timer</translation>
+        <translation type="obsolete">24 timer</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 timer</translation>
+        <translation type="obsolete">12 timer</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Ugen starter med</translation>
+        <translation type="obsolete">Ugen starter med</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Søndag</translation>
+        <translation type="obsolete">Søndag</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Mandag</translation>
+        <translation type="obsolete">Mandag</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Datoformat</translation>
+        <translation type="obsolete">Datoformat</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Panelprogram format</translation>
+        <translation type="obsolete">Panelprogram format</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>hh:mm</translation>
+        <translation type="obsolete">hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>D/M hh:mm</translation>
+        <translation type="obsolete">D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/D hh:mm</translation>
+        <translation type="obsolete">M/D hh:mm</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
-        <translation>Time</translation>
+        <translation type="obsolete">Time</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Minut</translation>
+        <translation type="obsolete">Minut</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="obsolete">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="obsolete">PM</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation type="unfinished">Time</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="unfinished">Minut</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="unfinished">AM</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="unfinished">PM</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Dato</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">Brug forudsagt tid</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/aqpkg.ts b/i18n/en/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/en/aqpkg.ts
+++ b/i18n/en/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</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,68 +1,71 @@
 <!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>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libopieobex.ts b/i18n/en/libopieobex.ts
index 99d06ec..5fda095 100644
--- a/i18n/en/libopieobex.ts
+++ b/i18n/en/libopieobex.ts
@@ -1,49 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
+    <name>OtherHandler</name>
     <message>
-        <source>OBEX Sending</source>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sending:</source>
+        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filename</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <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>ObexInc</name>
+    <name>SendWidget</name>
     <message>
-        <source>OBEX Receiving</source>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filename</source>
+        <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A file was beamed 
-to you.</source>
+        <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
+        <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reject</source>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/opieftp.ts b/i18n/en/opieftp.ts
index 4d84121..b837b35 100644
--- a/i18n/en/opieftp.ts
+++ b/i18n/en/opieftp.ts
@@ -1,239 +1,235 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/oxygen.ts b/i18n/en/oxygen.ts
index eaf68a3..c0003ef 100644
--- a/i18n/en/oxygen.ts
+++ b/i18n/en/oxygen.ts
@@ -1,561 +1,561 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Americium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Californium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index 87b424d..f692d4a 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -1,244 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></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"></translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/security.ts b/i18n/en/security.ts
index b9ec769..e7b76f9 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/systemtime.ts b/i18n/en/systemtime.ts
index 5958bed..c68c7e9 100644
--- a/i18n/en/systemtime.ts
+++ b/i18n/en/systemtime.ts
@@ -1,271 +1,250 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Ntp</name>
+    <name>FormatTabWidget</name>
     <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
+        <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Running:</source>
+        <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error while executing ntpdate</source>
+        <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>last [h]</source>
+        <source>12/24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>offset [s]</source>
+        <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>shift [s/h]</source>
+        <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> s/h</source>
+        <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get time from network</source>
+        <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set predicted time: </source>
+        <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Predict</source>
+        <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
+        <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error while getting time form
- server</source>
+        <source>You asked for a delay of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
+        <source> minutes, but only </source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NtpBase</name>
     <message>
-        <source>Network Time</source>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get time from network</source>
+        <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Time:</source>
+        <source>Running:
+ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>nan</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time Shift:</source>
+        <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Time:</source>
+        <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Esimated Shift:</source>
+        <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predicted Time:</source>
+        <source>Error while getting time from
+ server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean shift:</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set predicted time</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
     <message>
-        <source>Predict time</source>
+        <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>as</source>
+        <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP server to get the time from the network.</source>
+        <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wait for </source>
+        <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
     <message>
-        <source>minutes until</source>
+        <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insure a delay of</source>
+        <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
+        <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set time</source>
+        <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manual</source>
+        <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predict</source>
+        <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced settings</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
+    <name>SettingsTabWidget</name>
     <message>
-        <source>Time Zone</source>
+        <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
+        <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Monday</source>
+        <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date format</source>
+        <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Applet format</source>
+        <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
     <message>
-        <source>hh:mm</source>
+        <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D/M hh:mm</source>
+        <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>M/D hh:mm</source>
+        <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>System Time</source>
+        <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SetTime</name>
     <message>
-        <source>Hour</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minute</source>
+        <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AM</source>
+        <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>PM</source>
+        <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/aqpkg.ts b/i18n/es/aqpkg.ts
index fcf49bc..8702220 100644
--- a/i18n/es/aqpkg.ts
+++ b/i18n/es/aqpkg.ts
@@ -1,546 +1,589 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished">Filtro de Categorías</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Leyendo configuración...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished">Espacio disponible</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">Salida</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Empezar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Opciones</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished">Opciones</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">Forzar sobreescribir</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Escriba aquí el texto a buscar.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Pulse aquí para esconder la barra Salto Rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Actualizar listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Renovar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Pulse aquí para actualizar todos los paquetes instalados si se dispone de una nueva versión.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Aplicar cambios</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Pulse aquí para instalar, borrar o renovar los paquetes instalados actualmente.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostrar paquetes no instalados</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Pulse aquí para mostrar los paquetes disponibles que no han sido instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostrar paquetes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostrar paquetes actualizados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo que tienen una versión más nueva disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrar por categoría</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Pulse aquí para listar paquetes que pertenecen a una categoría.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Fijar categoría del filtro</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Pulse aquí para cambiar la categoría de paquetes que serán filtrados.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Pulse aquí para buscar texto en el nombre de los paquetes.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Teclas de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Pulse aquí para mostrar/esconder el teclado que permite moverse rápidamente a través de la lista de paquetes.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Pulse aquí para seleccionar una fuente de paquetes.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paquetes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Ésta es una lista de todos los paquetes del servidor selecionado arriba.
 
 Un punto azul junto al nombre del paquete indica que está instalado actualmente.
 
 Un punto azul con una estrella indica que hay una versión más moderna disponible.
 
 Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Pulse aquí para desinstalar los paquetes seleccionados.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista del servidor:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista de paquetes para:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
-        <translation>Instalado en - %1</translation>
+        <translation type="obsolete">Instalado en - %1</translation>
     </message>
     <message>
         <source>Description - %1</source>
-        <translation>Descripción - %1</translation>
+        <translation type="obsolete">Descripción - %1</translation>
     </message>
     <message>
         <source>Size - %1</source>
-        <translation>Tamaño - %1</translation>
+        <translation type="obsolete">Tamaño - %1</translation>
     </message>
     <message>
         <source>Section - %1</source>
-        <translation>Sección - %1</translation>
+        <translation type="obsolete">Sección - %1</translation>
     </message>
     <message>
         <source>Filename - %1</source>
-        <translation>Nombre fichero - %1</translation>
+        <translation type="obsolete">Nombre fichero - %1</translation>
     </message>
     <message>
         <source>V. Installed - %1</source>
-        <translation>Ver. instalada - %1</translation>
+        <translation type="obsolete">Ver. instalada - %1</translation>
     </message>
     <message>
         <source>V. Available - %1</source>
-        <translation>Ver. disponible - %1</translation>
+        <translation type="obsolete">Ver. disponible - %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Refrescando listas de paquetes del servidor</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATENCIÓN: ¡No se recomienda
 actualizar mientras
 Opie/Qtopia está corriendo!
 
 ¿Está seguro?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Renovando paquetes instalados</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>¿Está seguro que desea borrar
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>¿Está seguro?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Descargar a dónde</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Introduzca carpeta donde descargar</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Instalar paquete remoto</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Introduzca localización del paquete</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>No hay nada que hacer</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>No hay paquetes seleccionados</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>¿Desea borrar o reinstalar
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Borrar o reinstalar</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>¿Desea borrar o actualizar
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Borrar o actualizar</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">Configuración</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished">Destinos</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">Proxies</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished">Servidor activo</translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destino</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">Habilitada</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/kpacman.ts b/i18n/es/kpacman.ts
index 797faba..c4ad0c6 100644
--- a/i18n/es/kpacman.ts
+++ b/i18n/es/kpacman.ts
@@ -1,252 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predeterminados</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Cambiar teclas de dirección</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Tecla indefinida</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nuevo</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pausa</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Hall de la fama</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Ocultar cursor</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>Seleccionar &amp;esquema gráfico</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>Pa&amp;rar en segundo plano</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Continuar en primer plano</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Cambiar &amp;teclas...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Juego de pacman para KDE
 
 Programa basado en el código de ksnake
 de Michel Filippi (mfilippi@sade.rhein-main.de).
 Diseño fuertemente influenciado por pacman
 (c) 1980 MIDWAY MFG.CO.
 
 Quiero agradecer a mi novia Elke Krueers sus
 últimos 10 años de amistad.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
         <source>Configuration Error</source>
         <translation>Error de configuración</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
         <translation>No hay esquemas definidos, o
 no seleccionó ningún esquema.</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>La fuente de bits no pudo construirse.
 
 El fichero &apos;@FONTNAME@&apos; no existe,
 o está en un formato desconocido.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>FIN DEL JUEGO</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>JUGADOR 1</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>¡PREPARADO!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>CARÁCTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>APODO</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SOMBRA</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;INTERMITENTE&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-RÁPIDO</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;MEÑIQUE&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-VERGONZOSO</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;TINTADO&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PULSE EL CURSOR PARA EMPEZAR</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP </translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation> PUNTUACIÓN MAX </translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP </translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    ENHORABUENA      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   HA CONSEGUIDO    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation> UNA BUENA PUNTUACIÓN.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>CLAS   PTS   NOMBRE FECHA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source>                          </source>
-        <translation>                          </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>La fuente de bits no pudo construirse.
 
 El fichero &apos;@PIXMAPNAME@&apos; no existe,
 o está en un formato desconocido.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Error al iniciar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index 8ffd59b..a80acec 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Líquido</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Estilo Líquido</translation>
+        <translation type="unfinished">Estilo Líquido</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Sin transparencias</translation>
+        <translation type="unfinished">Sin transparencias</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Punteado, color de fondo</translation>
+        <translation type="unfinished">Punteado, color de fondo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Punteado, color de botón</translation>
+        <translation type="unfinished">Punteado, color de botón</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Punteado translúcido, color de fondo</translation>
+        <translation type="unfinished">Punteado translúcido, color de fondo</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Punteado translúcido, color de botón</translation>
+        <translation type="unfinished">Punteado translúcido, color de botón</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Transparencia propia</translation>
+        <translation type="unfinished">Transparencia propia</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Color del menú</translation>
+        <translation type="unfinished">Color del menú</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Color del texto</translation>
+        <translation type="unfinished">Color del texto</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opacidad</translation>
+        <translation type="unfinished">Opacidad</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usar texto del menú sombreado</translation>
+        <translation type="unfinished">Usar texto del menú sombreado</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Botones planos en barra herramientas</translation>
+        <translation type="unfinished">Botones planos en barra herramientas</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Puntear contraste</translation>
+        <translation type="unfinished">Puntear contraste</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Líquido</translation>
+        <translation type="unfinished">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Estilo Líquido de alto rendimiento por Mosfet</translation>
+        <translation type="unfinished">Estilo Líquido de alto rendimiento por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopieobex.ts b/i18n/es/libopieobex.ts
index a3e7274..28b2f40 100644
--- a/i18n/es/libopieobex.ts
+++ b/i18n/es/libopieobex.ts
@@ -1,50 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ObexDlg</name>
     <message>
         <source>OBEX Sending</source>
-        <translation>OBEX Enviando</translation>
+        <translation type="obsolete">OBEX Enviando</translation>
     </message>
     <message>
         <source>Sending:</source>
-        <translation>Enviando:</translation>
+        <translation type="obsolete">Enviando:</translation>
     </message>
     <message>
         <source>filename</source>
-        <translation>fichero</translation>
+        <translation type="obsolete">fichero</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
+        <translation type="obsolete">&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>ObexInc</name>
     <message>
         <source>OBEX Receiving</source>
-        <translation>OBEX Reciviendo</translation>
+        <translation type="obsolete">OBEX Reciviendo</translation>
     </message>
     <message>
         <source>TextLabel1</source>
-        <translation>EtiquetaTexto1</translation>
+        <translation type="obsolete">EtiquetaTexto1</translation>
     </message>
     <message>
         <source>Filename</source>
-        <translation>Fichero</translation>
+        <translation type="obsolete">Fichero</translation>
     </message>
     <message>
         <source>A file was beamed 
 to you.</source>
-        <translation>Se emitió un fichero
+        <translation type="obsolete">Se emitió un fichero
 para usted.</translation>
     </message>
     <message>
         <source>Insert</source>
-        <translation>Insertar</translation>
+        <translation type="obsolete">Insertar</translation>
     </message>
     <message>
         <source>Reject</source>
-        <translation>Rechazar</translation>
+        <translation type="obsolete">Rechazar</translation>
+    </message>
+</context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opieftp.ts b/i18n/es/opieftp.ts
index b151124..9387991 100644
--- a/i18n/es/opieftp.ts
+++ b/i18n/es/opieftp.ts
@@ -1,251 +1,251 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>Cliente FTP</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Remoto</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar ficheros ocultos</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crear directorio</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Cambiar a local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Cambiar a remoto</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Cambiar a configurar</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>Sobre</translation>
+        <translation type="obsolete">Sobre</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Carpeta</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Clave</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Servidor remoto</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Ruta remota</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Por favor, especifique servidor</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Incapaz de conectar con
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Incapaz de registrame en
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Incapaz de subir
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>No puedo subir directorios</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Incapaz de descargar
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Incapaz de listar dir
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Incapaz de cambiar dir</translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Incapaz de subir a dir
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Incapaz de alcanzar dir</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Quiere realmente borrar
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 Debaría estar vacío</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Incapaz de crear dir
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Incapaz de borrar dir
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Incapaz de borrar fichero
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Incapaz de renombrar fichero
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ese directorio no existe</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Nuevo nombre servidor</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Lo siento, nombre ya usado</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/oxygen.ts b/i18n/es/oxygen.ts
index 089e405..890a301 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -1,562 +1,566 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcular</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso molecular</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Fórmula química</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso molecular (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composición elemental (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
-        <translation>Peso:</translation>
+        <translation type="obsolete">Peso:</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Bloque</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electronegatividad</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Radio atómico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energía ionización</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densidad</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Punto ebullición</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Punto fusión</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hidrógeno</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Litio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berilio</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbono</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Nitrógeno</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neón</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicio</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fósforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Azufre</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argón</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potasio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcio</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Escandio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titánio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadio</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Cromo</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganeso</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Hierro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Niquel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Cobre</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinc</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Galio</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsénico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selenio</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Kriptón</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidio</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Estroncio</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Ytrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconio</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molibdeno</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Tecnecio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Rutenio</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rodio</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Paladio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Plata</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmio</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indio</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Estaño</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimonio</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Teluro</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Yodo</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenón</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Césio</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Bario</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantano</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerio</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodimio</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodimio</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Prometio</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samario</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinio</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Disprosio</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmio</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbio</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Tulio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Yterbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutecio</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tántalo</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolframio</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Renio</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmio</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridio</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platino</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Oro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercurio</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Talio</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Plomo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonio</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astato</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radón</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francio</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radio</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Actinio</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Torio</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protactinio</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uranio</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Neptuno</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonio</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Americio</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curio</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berquelio</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californio</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einstenio</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermio</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendelevio</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobelio</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Laurencio</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordio</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnio</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgio</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrio</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassio</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerio</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Sistema Periódico</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>ERROR: 
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Datos Químicos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index 4e1620e..ced4de6 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,249 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Ver como lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery is running very low.</source>
         <translation>La batería está muy baja.</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>tarjeta de visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Información</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>&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Estado de la Batería</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Ver como documentos</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Medio insertado</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Enlace a aplicaciones</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Limitar búsqueda al directorio: (no se usa aún)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>Su decisión será guardada en el medio.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</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>&lt;p&gt;
 Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Apagar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Conexión de sincronización</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Denegar</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Permitir</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>&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</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>&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 4a20877..288e958 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -1,102 +1,106 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Fijar código</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introducir código</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Código Incorrecto</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>El código introducido es incorrecto.
 Acceso denegado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Teclee nuevo código</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Reintroduzca nuevo código</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configuración de Seguridad</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Borrar código</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Solicitar código al encender</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sincronización desde red:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (predefinido)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/systemtime.ts b/i18n/es/systemtime.ts
index f56082f..a25ec03 100644
--- a/i18n/es/systemtime.ts
+++ b/i18n/es/systemtime.ts
@@ -1,272 +1,520 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation type="unfinished">Formato hora</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation type="unfinished">hh:mm</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">D/M hh:mm</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/D hh:mm</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 horas</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation type="unfinished">24 horas</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation type="unfinished">12 horas</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation type="unfinished">Formato fecha</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Inicio semana</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished">Domingo</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished">Lunes</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">Configuración</translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished">Predecir</translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished">Error al ejecutar ntpdate</translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"> segundos</translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished">No pude conectar con el servidor </translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
-        <translation>time.fu-berlin.de</translation>
+        <translation type="obsolete">time.fu-berlin.de</translation>
     </message>
     <message>
         <source>Run NTP?</source>
-        <translation>¿Ejecutar NTP?</translation>
+        <translation type="obsolete">¿Ejecutar NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
-        <translation>Ejecutando:</translation>
+        <translation type="obsolete">Ejecutando:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation>Error al ejecutar ntpdate</translation>
+        <translation type="obsolete">Error al ejecutar ntpdate</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation> segundos</translation>
+        <translation type="obsolete"> segundos</translation>
     </message>
     <message>
         <source>last [h]</source>
-        <translation>último [h]</translation>
+        <translation type="obsolete">último [h]</translation>
     </message>
     <message>
         <source>offset [s]</source>
-        <translation>corrección [s]</translation>
+        <translation type="obsolete">corrección [s]</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
-        <translation>ajuste [s/h]</translation>
+        <translation type="obsolete">ajuste [s/h]</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation> s/h</translation>
+        <translation type="obsolete"> s/h</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>Obtener hora de la Red</translation>
+        <translation type="obsolete">Obtener hora de la Red</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
-        <translation>Fijar predicción de hora: </translation>
+        <translation type="obsolete">Fijar predicción de hora: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation>No pude conectar con el servidor </translation>
+        <translation type="obsolete">No pude conectar con el servidor </translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Predecir</translation>
+        <translation type="obsolete">Predecir</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>Principal</translation>
+        <translation type="obsolete">Principal</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Configuración</translation>
+        <translation type="obsolete">Configuración</translation>
     </message>
     <message>
         <source>ntp error</source>
-        <translation>error ntp</translation>
+        <translation type="obsolete">error ntp</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
-        <translation>¡Error al obtener la hora de la Red!</translation>
+        <translation type="obsolete">¡Error al obtener la hora de la Red!</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
-        <translation>Error al obtener la hora del
+        <translation type="obsolete">Error al obtener la hora del
 servidor</translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation>Pidió un retardo de %1 minutos, pero sólo %2 han pasado desde la última revisión. &lt;br&gt;¿Reejecuto NTP?</translation>
+        <translation type="obsolete">Pidió un retardo de %1 minutos, pero sólo %2 han pasado desde la última revisión. &lt;br&gt;¿Reejecuto NTP?</translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
-        <translation>Hora de la Red</translation>
+        <translation type="obsolete">Hora de la Red</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>Obtener hora de la Red</translation>
+        <translation type="obsolete">Obtener hora de la Red</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation>Hora inicio:</translation>
+        <translation type="obsolete">Hora inicio:</translation>
     </message>
     <message>
         <source>nan</source>
-        <translation>nan</translation>
+        <translation type="obsolete">nan</translation>
     </message>
     <message>
         <source>Time Shift:</source>
-        <translation>Ajuste de hora:</translation>
+        <translation type="obsolete">Ajuste de hora:</translation>
     </message>
     <message>
         <source>New Time:</source>
-        <translation>Nueva hora:</translation>
+        <translation type="obsolete">Nueva hora:</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
-        <translation>Ajuste estimado:</translation>
+        <translation type="obsolete">Ajuste estimado:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
-        <translation>Predicción de hora:</translation>
+        <translation type="obsolete">Predicción de hora:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
-        <translation>Ajuste promedio:</translation>
+        <translation type="obsolete">Ajuste promedio:</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation>Fijar predicción de hora</translation>
+        <translation type="obsolete">Fijar predicción de hora</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation>Predicción de hora</translation>
+        <translation type="obsolete">Predicción de hora</translation>
     </message>
     <message>
         <source>Use</source>
-        <translation>Usar</translation>
+        <translation type="obsolete">Usar</translation>
     </message>
     <message>
         <source>as</source>
-        <translation>como</translation>
+        <translation type="obsolete">como</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
-        <translation>servidor NTP para obtener la hora de la Red.</translation>
+        <translation type="obsolete">servidor NTP para obtener la hora de la Red.</translation>
     </message>
     <message>
         <source>Wait for </source>
-        <translation>Esperar </translation>
+        <translation type="obsolete">Esperar </translation>
     </message>
     <message>
         <source>minutes until</source>
-        <translation>minutos hasta que</translation>
+        <translation type="obsolete">minutos hasta que</translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
-        <translation>intentos NTP para sincronizar el reloj con la Red.</translation>
+        <translation type="obsolete">intentos NTP para sincronizar el reloj con la Red.</translation>
     </message>
     <message>
         <source>Insure a delay of</source>
-        <translation>Asegurar un retraso de</translation>
+        <translation type="obsolete">Asegurar un retraso de</translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
-        <translation>una nueva conexión NTP será usada para predecir la hora.</translation>
+        <translation type="obsolete">una nueva conexión NTP será usada para predecir la hora.</translation>
     </message>
     <message>
         <source>Set time</source>
-        <translation>Fijar hora</translation>
+        <translation type="obsolete">Fijar hora</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>Principal</translation>
+        <translation type="obsolete">Principal</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation>Manual</translation>
+        <translation type="obsolete">Manual</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Configuración</translation>
+        <translation type="obsolete">Configuración</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Predecir</translation>
+        <translation type="obsolete">Predecir</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Advanced settings</source>
-        <translation>Configuración avanzada</translation>
+        <translation type="obsolete">Configuración avanzada</translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished">Predicción de hora</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">Fijar predicción de hora</translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"> s/h</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"> segundos</translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation>Zona horaria</translation>
+        <translation type="obsolete">Zona horaria</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Fecha</translation>
+        <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Formato hora</translation>
+        <translation type="obsolete">Formato hora</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 horas</translation>
+        <translation type="obsolete">24 horas</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 horas</translation>
+        <translation type="obsolete">12 horas</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Inicio semana</translation>
+        <translation type="obsolete">Inicio semana</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Domingo</translation>
+        <translation type="obsolete">Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Lunes</translation>
+        <translation type="obsolete">Lunes</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Formato fecha</translation>
+        <translation type="obsolete">Formato fecha</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Formato icono</translation>
+        <translation type="obsolete">Formato icono</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>hh:mm</translation>
+        <translation type="obsolete">hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>D/M hh:mm</translation>
+        <translation type="obsolete">D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/D hh:mm</translation>
+        <translation type="obsolete">M/D hh:mm</translation>
     </message>
     <message>
         <source>System Time</source>
-        <translation>Hora del Sistema</translation>
+        <translation type="obsolete">Hora del Sistema</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
-        <translation>Hora</translation>
+        <translation type="obsolete">Hora</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Minuto</translation>
+        <translation type="obsolete">Minuto</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="obsolete">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="obsolete">PM</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation type="unfinished">Hora</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="unfinished">Minuto</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="unfinished">AM</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="unfinished">PM</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Fecha</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">Fijar predicción de hora</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/aqpkg.ts b/i18n/fr/aqpkg.ts
index afea5f4..01d7815 100644
--- a/i18n/fr/aqpkg.ts
+++ b/i18n/fr/aqpkg.ts
@@ -1,547 +1,590 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished">Filtre par catégorie</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lecture de la configuration...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished">Espace dispo</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">Sortie</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Démarrer</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Options</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished">Options</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">Forcer les dépendances</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">Forcer la réinstallation</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">Forcer l&apos;effacement</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">Forcer la ré-écriture</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestionnaire de Package</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Taper le texte à rechercher ici.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Cliquer ici pour cacher le clavier.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Mettre à jour les listes</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Cliquer ici pour mettre les listes de packages à jour depuis les serveurs.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Mettre à jour</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Cliquer ici pour mettre à jour tous les packages installés si une nouvelle version est disponible.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Cliquer ici pour télécharger le(s) package(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Appliquer les changements</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Cliquer ici pour installer, enlever ou mettre à jour le(s) package(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Montrer les packages non installés</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Cliquer ici pour afficher les packages non installés disponibles.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Afficher les packages installés</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Cliquer ici pour afficher les packages installés sur cet appareil.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Afficher les packages mis à jour</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Cliquer ici pour afficher les packages installés sur cet appareil et dont une version plus récente est disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Fltrer par catégorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Cliquer ici pour afficher les packages appartenant à une catégorie.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Définir le filtre par catégorie</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Cliquer ici pour changer la catégorie de packages à utiliser comme filtre.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Cliquer ici pour rechercher un texte dans les noms des packages.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Trouver suivant</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Cliquer ici pour trouver le package suivant contenant le texte recherché.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Recheche par lettre</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Cliquer ici pour afficher/caher le clavier permettant le déplacement rapide dans la liste des packages</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Affichage</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Cliquer ici pour configurer l&apos;application.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Cliquer ici pour fermer la barre de recherche.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serveur :</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Cliquer ici pour sélectionner un serveur de packages.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Packages</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Voici la liste de tous les packages disponibles sur le serveur sélectionné.
 
 Un point bleu signifie que le package est déjà installé sur cet appareil.
 
 Un point bleu avec une étoile signifie que le package est déjà installé, mais que la version du serveur est plus récente.
 
 Cochez la case en début de ligne pour sélectionner un package.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Cliquer ici pour désinstaller le(s) package(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construit la liste du serveur :
 %1
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Construit la liste des packages pour :
 %1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
-        <translation>Installé en - %1</translation>
+        <translation type="obsolete">Installé en - %1</translation>
     </message>
     <message>
         <source>Description - %1</source>
-        <translation>Description - %1</translation>
+        <translation type="obsolete">Description - %1</translation>
     </message>
     <message>
         <source>Size - %1</source>
-        <translation>Taille - %1</translation>
+        <translation type="obsolete">Taille - %1</translation>
     </message>
     <message>
         <source>Section - %1</source>
-        <translation>Section - %1</translation>
+        <translation type="obsolete">Section - %1</translation>
     </message>
     <message>
         <source>Filename - %1</source>
-        <translation>Nom - %1</translation>
+        <translation type="obsolete">Nom - %1</translation>
     </message>
     <message>
         <source>V. Installed - %1</source>
-        <translation>V. installée - %1</translation>
+        <translation type="obsolete">V. installée - %1</translation>
     </message>
     <message>
         <source>V. Available - %1</source>
-        <translation>V. dispo - %1</translation>
+        <translation type="obsolete">V. dispo - %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Rafraîchit la liste des serveurs de packages</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATTENTION : La mise à jour
 lorsque Opie/Qtopia fonctionne
 n&apos;est PAS recommandée.
 
 Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Attention</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Met à jour les packages installés</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Etes-vous sûr de vouloir effacer
 %1 ?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Télécharger où</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Entrez la destination du téléchargement</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installer les packages distants</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Entrez la localisation du package</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Rien à faire</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Aucun package sélectionné</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Voulez-vous enlever ou réinstaller
 %1 ?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Enlever ou Réinstaller</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Réinstaller</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Voulez-vous enlever ou mettre à jour
 %1 ?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Enlever ou Mettre à jour</translation>
     </message>
     <message>
         <source>U</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">Configuration</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">Serveurs</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished">Destinations</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">Proxies</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nom :</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished">Serveur actif</translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destination</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">Activé</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/kpacman.ts b/i18n/fr/kpacman.ts
index e6a7bf0..48acc64 100644
--- a/i18n/fr/kpacman.ts
+++ b/i18n/fr/kpacman.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Défauts</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Changer les touches de direction</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Touche non définie</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Hall of fame</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Cacher le curseur de la souris</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Selectionner un thème graphique</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>Pause en tâche de &amp;Fond</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>Continuer en tâche &amp;Active</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Changer les &amp;Touches...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Un jeu pacman pour le bureau KDE 
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>Configuration Error</source>
         <translation>Erreur de configuration</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
         <translation>Il n&apos;y a pas de thème défini
 ou auncun thème n&apos;est sélectionné.</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Le &quot;bitfont&quot; ne peut pas être construit.
 
 Le fichier &apos;@FONTNAME@&apos; n&apos;existe pas,
 ou est dans un format inconnu.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>JEU TERMINE</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>JOUEUR UN</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>PRET!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>PERSONNAGE</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>SURNOM</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>Portage QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>Presser le curseur pour démarrer</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>MEILLEUR SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>FELICITATIONS</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>VOUS AVEZ ATTEIND</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>UN SCORE DANS LE TOP 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK SCORE NOM DATE</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>L&apos;image ne peut-être construite.
 
 Le fichier &apos;@PIXMAPNAME@&apos; n&apos;existe pas,
 ou est dans un format inconnu.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Erreur d&apos;initialisation</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libliquid.ts b/i18n/fr/libliquid.ts
index b587cd6..f4c13c1 100644
--- a/i18n/fr/libliquid.ts
+++ b/i18n/fr/libliquid.ts
@@ -1,69 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Style Liquid</translation>
+        <translation type="unfinished">Style Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Pas de transparence</translation>
+        <translation type="unfinished">Pas de transparence</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Stippled, background color</translation>
+        <translation type="unfinished">Stippled, background color</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Stippled, button color</translation>
+        <translation type="unfinished">Stippled, button color</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Translucent stippled, background color</translation>
+        <translation type="unfinished">Translucent stippled, background color</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Translucent stippled, button color</translation>
+        <translation type="unfinished">Translucent stippled, button color</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Personalisation de la transparence</translation>
+        <translation type="unfinished">Personalisation de la transparence</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Couleur des menus</translation>
+        <translation type="unfinished">Couleur des menus</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Couleur des textes</translation>
+        <translation type="unfinished">Couleur des textes</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opacité</translation>
+        <translation type="unfinished">Opacité</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Utiliser des menus ombrés</translation>
+        <translation type="unfinished">Utiliser des menus ombrés</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Rendre unis les buttons de la barre des outils</translation>
+        <translation type="unfinished">Rendre unis les buttons de la barre des outils</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Stipple contrast</translation>
+        <translation type="unfinished">Stipple contrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Style &quot;High Performance Liquid&quot; par Mosfet</translation>
+        <translation type="unfinished">Style &quot;High Performance Liquid&quot; par Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopieobex.ts b/i18n/fr/libopieobex.ts
index 515b927..9563c0f 100644
--- a/i18n/fr/libopieobex.ts
+++ b/i18n/fr/libopieobex.ts
@@ -1,51 +1,125 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ObexDlg</name>
     <message>
         <source>OBEX Sending</source>
-        <translation>Envoie OBEX</translation>
+        <translation type="obsolete">Envoie OBEX</translation>
     </message>
     <message>
         <source>Sending:</source>
-        <translation>Envoie :</translation>
+        <translation type="obsolete">Envoie :</translation>
     </message>
     <message>
         <source>filename</source>
-        <translation>Nom de fichier</translation>
+        <translation type="obsolete">Nom de fichier</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
+        <translation type="obsolete">&amp;Annuler</translation>
     </message>
 </context>
 <context>
     <name>ObexInc</name>
     <message>
         <source>OBEX Receiving</source>
-        <translation>Réception OBEX</translation>
+        <translation type="obsolete">Réception OBEX</translation>
     </message>
     <message>
         <source>TextLabel1</source>
-        <translation>TextLabel1</translation>
+        <translation type="obsolete">TextLabel1</translation>
     </message>
     <message>
         <source>Filename</source>
-        <translation>Nom de fichier</translation>
+        <translation type="obsolete">Nom de fichier</translation>
     </message>
     <message>
         <source>A file was beamed 
 to you.</source>
-        <translation>Vous avez recu un
+        <translation type="obsolete">Vous avez recu un
 fichier.</translation>
     </message>
     <message>
         <source>Insert</source>
-        <translation>Accepter</translation>
+        <translation type="obsolete">Accepter</translation>
     </message>
     <message>
         <source>Reject</source>
-        <translation>Refuser</translation>
+        <translation type="obsolete">Refuser</translation>
+    </message>
+</context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/opieftp.ts b/i18n/fr/opieftp.ts
index 35575df..bdd654f 100644
--- a/i18n/fr/opieftp.ts
+++ b/i18n/fr/opieftp.ts
@@ -1,251 +1,251 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>local</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Distant</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Connect</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Déconnecte</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Montrer les fichiers cachés</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Créer un répertoire</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renomer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Passer au répertoire local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Passer au répertoire distant</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Paser à la config</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Rép</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Serveur distant</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Chemin distant</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Config</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Définissez les infos du serveur distant svp</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Impossible de se connecter à
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Impossible de se &quot;loguer&quot; à 
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Impossible de télécharger
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Impossible de télécharger les répertoires</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Impossible de télécharger
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Impossible de lister le répertoire</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Impossible de changer de répertoire
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Impossible de remonter</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Impossibled d&apos;obtenir le rép de travail
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Changer de répertoire</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous réellement effacer
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>?
 Il doit être vide</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Impossible de créer un répertoire</translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Impossible d&apos;effacer le répertoire
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Impossible d&apos;effacer le fichier
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Impossible de renomer le fichier
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossibled de renomer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ce répertoire n&apos;existe pas</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>A propos</translation>
+        <translation type="obsolete">A propos</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Rafraîchir</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>nouveau de nom de serveur</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Désolé, nom déjà utiliser</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/oxygen.ts b/i18n/fr/oxygen.ts
index 137e890..6daeac9 100644
--- a/i18n/fr/oxygen.ts
+++ b/i18n/fr/oxygen.ts
@@ -1,570 +1,566 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calculer</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <source>Form1</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Molecular Weight</source>
         <translation>poids moléculaire</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Formule Chimique</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Poids Moléculaire (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composition Elementaire (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
-        <translation>Poids:</translation>
+        <translation type="obsolete">Poids:</translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densité</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygène</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Données</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Calculs</translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation>Système Périodique</translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation>ERREUR: </translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Americium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Californium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>Système Périodique</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>ERREUR: </translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index cfbf9ca..47152ba 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,250 +1,258 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Problème de l&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1&gt; ne répond pas.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Voulez-vous forcer l&apos;pplication à quitter?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Toucher la croix fermement et
 avec précision pour calibrer l&apos;ércan.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenue sur Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vue icon</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vue liste</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Le niveau de batterie est critique!
 Restez éteint jusquau moment de la recharge!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>Le niveau de batterie est très bas.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>La niveau de la batterie de sauvegarde est très bas.
 Rechargez la batterie de sauvegarde SVP.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>business card</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</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>&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous corriger l&apos;heure?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Etat de la batterie</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Lanceur</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Lanceur</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Pas d&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Aucune application définie pour ce document&lt;p&gt;Type %1.</translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fichiers</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Tous les type de fichiers</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue document</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Media inséré</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Un &lt;b&gt;média de stockage&lt;/b&gt; a été inséré. Doit-il être parcouri à la recherche de fichiers?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Quels fichiers</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>liés les applications</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Limiter la recherche au répertoire: (pas encore utilisé)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>Votre choix va être enregistré sur le média.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Ne plus demander pour ce média</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Arrêter</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Arrêter Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Redémarrer Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Shutdown</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>&lt;p&gt;
 Ces options sont fournies pour être utilisées durant le développement et les tests du système Opie. Dans les conditions normales d&apos;utilisation, ces concepts ne sont pas nécessaires.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Shutdown...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Sync Connexion</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>&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous utiliser une version de &quot;Qtopia Desktop&quot; plus vieille que 1.5.1, mettez là à jour SVP.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Non authorisé</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>&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous venez just de démarrer une Synchronisation pour la 1ere fois, c&apos;est normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Authorisé</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Synchronisation en cours</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contacts&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index 10e0db9..f859dcf 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -1,102 +1,106 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Nouveau code</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Changer le code</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entrez le code secret</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Code incorrect</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Le code secret est incorrect.
 Accès refusé</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Sans</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Entrez le nouveau code</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Réentrez le code</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Paramètres de Sécurité</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Changer le code</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Effacer le code</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Demander le code secret au démarrage</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronisation</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accepter la synchronisation par réseau de :</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Le code secret permet un niveau de protection minimal pour l&apos;accès à votre organiseur.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (par défaut)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/systemtime.ts b/i18n/fr/systemtime.ts
index 4a89513..b6d45cd 100644
--- a/i18n/fr/systemtime.ts
+++ b/i18n/fr/systemtime.ts
@@ -1,271 +1,519 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation type="unfinished">Format d&apos;heure</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation type="unfinished">hh:mm</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">J/M hh:mm</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/J hh:mm</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24H</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation type="unfinished">24H</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation type="unfinished">12H</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation type="unfinished">Format de date</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Début semaine</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished">Dimanche</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished">Lundi</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished">Prévoir</translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished">Erreur lors de l&apos;execution de ntpdate</translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished">secondes</translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished">Impossible de se connecter au serveur</translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
-        <translation>chronos.cru.fr</translation>
+        <translation type="obsolete">chronos.cru.fr</translation>
     </message>
     <message>
         <source>Run NTP?</source>
-        <translation>Lancer NTP?</translation>
+        <translation type="obsolete">Lancer NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
-        <translation>Running:</translation>
+        <translation type="obsolete">Running:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation>Erreur lors de l&apos;execution de ntpdate</translation>
+        <translation type="obsolete">Erreur lors de l&apos;execution de ntpdate</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>secondes</translation>
+        <translation type="obsolete">secondes</translation>
     </message>
     <message>
         <source>last [h]</source>
-        <translation>dernier [h]</translation>
+        <translation type="obsolete">dernier [h]</translation>
     </message>
     <message>
         <source>offset [s]</source>
-        <translation>offset [s]</translation>
+        <translation type="obsolete">offset [s]</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
-        <translation>Décalage [s/h]</translation>
+        <translation type="obsolete">Décalage [s/h]</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation>s/h</translation>
+        <translation type="obsolete">s/h</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>Obtenir l&apos;heure par le réseau</translation>
+        <translation type="obsolete">Obtenir l&apos;heure par le réseau</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
-        <translation>Prévision de l&apos;heure:</translation>
+        <translation type="obsolete">Prévision de l&apos;heure:</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation>Impossible de se connecter au serveur</translation>
+        <translation type="obsolete">Impossible de se connecter au serveur</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Prévoir</translation>
+        <translation type="obsolete">Prévoir</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>Géneral</translation>
+        <translation type="obsolete">Géneral</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Options</translation>
+        <translation type="obsolete">Options</translation>
     </message>
     <message>
         <source>ntp error</source>
-        <translation>erreur ntp</translation>
+        <translation type="obsolete">erreur ntp</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
-        <translation>Erreur lors de l&apos;obtention de l&apos;heure par le réseau !</translation>
+        <translation type="obsolete">Erreur lors de l&apos;obtention de l&apos;heure par le réseau !</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
-        <translation>Lancer NTP ?</translation>
+        <translation type="obsolete">Lancer NTP ?</translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation>Vous avez demandé un délai de %1, mais seulement %2 minute(s) se sont écoulée(s).&lt;br&gt; Relancer NTP ?</translation>
+        <translation type="obsolete">Vous avez demandé un délai de %1, mais seulement %2 minute(s) se sont écoulée(s).&lt;br&gt; Relancer NTP ?</translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
-        <translation>Network Time</translation>
+        <translation type="obsolete">Network Time</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>Obtenir la date d&apos;un serveur NTP</translation>
+        <translation type="obsolete">Obtenir la date d&apos;un serveur NTP</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation>Heure de départ:</translation>
+        <translation type="obsolete">Heure de départ:</translation>
     </message>
     <message>
         <source>nan</source>
-        <translation>Aucune</translation>
+        <translation type="obsolete">Aucune</translation>
     </message>
     <message>
         <source>Time Shift:</source>
-        <translation>Décalage de l&apos;heure:</translation>
+        <translation type="obsolete">Décalage de l&apos;heure:</translation>
     </message>
     <message>
         <source>New Time:</source>
-        <translation>Nouvelle heure:</translation>
+        <translation type="obsolete">Nouvelle heure:</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
-        <translation>Décalage estimé:</translation>
+        <translation type="obsolete">Décalage estimé:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
-        <translation>Heure calculée:</translation>
+        <translation type="obsolete">Heure calculée:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
-        <translation>Décalage moyen:</translation>
+        <translation type="obsolete">Décalage moyen:</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation>Fixer la prévision de l&apos;heure</translation>
+        <translation type="obsolete">Fixer la prévision de l&apos;heure</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation>Heure prévu</translation>
+        <translation type="obsolete">Heure prévu</translation>
     </message>
     <message>
         <source>Use</source>
-        <translation>Utiliser</translation>
+        <translation type="obsolete">Utiliser</translation>
     </message>
     <message>
         <source>as</source>
-        <translation>comme</translation>
+        <translation type="obsolete">comme</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
-        <translation>serveur NTP pour obtenir la date et l&apos;heure.</translation>
+        <translation type="obsolete">serveur NTP pour obtenir la date et l&apos;heure.</translation>
     </message>
     <message>
         <source>Wait for </source>
-        <translation>Attendre</translation>
+        <translation type="obsolete">Attendre</translation>
     </message>
     <message>
         <source>minutes until</source>
-        <translation>minute(s) avant</translation>
+        <translation type="obsolete">minute(s) avant</translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
-        <translation>que NTP essaye de synchroniser l&apos;heure avec le réseau.</translation>
+        <translation type="obsolete">que NTP essaye de synchroniser l&apos;heure avec le réseau.</translation>
     </message>
     <message>
         <source>Insure a delay of</source>
-        <translation>S&apos;assurer d&apos;un délai de</translation>
+        <translation type="obsolete">S&apos;assurer d&apos;un délai de</translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
-        <translation>un nouvel appel à NTP sera utilisé pour prédire l&apos;heure.</translation>
+        <translation type="obsolete">un nouvel appel à NTP sera utilisé pour prédire l&apos;heure.</translation>
     </message>
     <message>
         <source>Set time</source>
-        <translation>Régler l&apos;heure</translation>
+        <translation type="obsolete">Régler l&apos;heure</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>Principal</translation>
+        <translation type="obsolete">Principal</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation>Manuel</translation>
+        <translation type="obsolete">Manuel</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Paramètres</translation>
+        <translation type="obsolete">Paramètres</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Prévoir</translation>
+        <translation type="obsolete">Prévoir</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Advanced settings</source>
-        <translation>Paramètres avancés</translation>
+        <translation type="obsolete">Paramètres avancés</translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished">Heure prévu</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">Fixer la prévision de l&apos;heure</translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished">s/h</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished">secondes</translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation>Zone</translation>
+        <translation type="obsolete">Zone</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Date</translation>
+        <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Format d&apos;heure</translation>
+        <translation type="obsolete">Format d&apos;heure</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24H</translation>
+        <translation type="obsolete">24H</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12H</translation>
+        <translation type="obsolete">12H</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Début semaine</translation>
+        <translation type="obsolete">Début semaine</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Dimanche</translation>
+        <translation type="obsolete">Dimanche</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Lundi</translation>
+        <translation type="obsolete">Lundi</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Format de date</translation>
+        <translation type="obsolete">Format de date</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Affichage barre</translation>
+        <translation type="obsolete">Affichage barre</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>hh:mm</translation>
+        <translation type="obsolete">hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>J/M hh:mm</translation>
+        <translation type="obsolete">J/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/J hh:mm</translation>
+        <translation type="obsolete">M/J hh:mm</translation>
     </message>
     <message>
         <source>System Time</source>
-        <translation>Paramètres Horaires</translation>
+        <translation type="obsolete">Paramètres Horaires</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
-        <translation>H.</translation>
+        <translation type="obsolete">H.</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Min.</translation>
+        <translation type="obsolete">Min.</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>am</translation>
+        <translation type="obsolete">am</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>pm</translation>
+        <translation type="obsolete">pm</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation type="unfinished">H.</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="unfinished">Min.</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="unfinished">am</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="unfinished">pm</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">Fixer la prévision de l&apos;heure</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/aqpkg.ts b/i18n/hu/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/hu/aqpkg.ts
+++ b/i18n/hu/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libliquid.ts b/i18n/hu/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/hu/libliquid.ts
+++ b/i18n/hu/libliquid.ts
@@ -1,68 +1,71 @@
 <!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>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libopieobex.ts b/i18n/hu/libopieobex.ts
index 99d06ec..5fda095 100644
--- a/i18n/hu/libopieobex.ts
+++ b/i18n/hu/libopieobex.ts
@@ -1,49 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
+    <name>OtherHandler</name>
     <message>
-        <source>OBEX Sending</source>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sending:</source>
+        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filename</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <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>ObexInc</name>
+    <name>SendWidget</name>
     <message>
-        <source>OBEX Receiving</source>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filename</source>
+        <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A file was beamed 
-to you.</source>
+        <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
+        <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reject</source>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/opieftp.ts b/i18n/hu/opieftp.ts
index 4d84121..b837b35 100644
--- a/i18n/hu/opieftp.ts
+++ b/i18n/hu/opieftp.ts
@@ -1,239 +1,235 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index 348335d..afeaff9 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -1,249 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Érintse meg pontosan és határozottan
 a kereszteket a képernyő kalibrálásához.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Üdvözli önt az Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Dokumentumok</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Listanézet</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Az elem szintje kritikus!
 Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>Az elem kezd kimerülni.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>A biztonsági-elem szintje nagyon alacsony.
 Kérem töltse fel a biztonsági-elemt.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>névjegykártya</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Információ</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>&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Elem állapot</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Indító</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Indító</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nincs alkalmazás</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Ehhez a dokumentumhoz nincs alkalmazás megadva.&lt;p&gt;Típusa: %1.</translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fájl</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Minden fájltípus</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentum nézet</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Eszköz betéve</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Egy &lt;b&gt;tároló eszközt&lt;/b&gt; helyezett a gépbe. Keressek rajta média fájlokat?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Mely média fájlokat</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Hang</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Kép</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Szöveg</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Videó</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Csatold az alkalmazásokat</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Keresés korlátozása a könyvtárra: (még nem használt)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>A választása az eszközön lesz tárolva.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Ennél az eszköznél ne kérdezze újra</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Bezárás</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Opie bezárása</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Újraindít</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Opie újraindítása</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Leállítás</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>&lt;p&gt;
 Ezeka bezárási lehetőségek elsősorban az Opie fejlesztése és tesztelése céljából vannak. Egy normális környezetben ezek feleslegesek.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Mégsem</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Leállítás...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Szinkronizációs kapcsolat</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>&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha a Qtopia Desktop 1.5.1-es verziójánál régebbit használ, kérjük frissítsen.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Megtagad</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>&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha éppen most telepítette a Szinkronozálót először, ez normális.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Engedélyez</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Szinkronizálás</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Címlista&lt;b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Mégsem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/security.ts b/i18n/hu/security.ts
index b9ec769..e7b76f9 100644
--- a/i18n/hu/security.ts
+++ b/i18n/hu/security.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/systemtime.ts b/i18n/hu/systemtime.ts
index f1f3ea4..1f04908 100644
--- a/i18n/hu/systemtime.ts
+++ b/i18n/hu/systemtime.ts
@@ -1,80 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation type="unfinished">Időformátum</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation type="unfinished">óó:pp</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">N/H óó:pp</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">H/N óó:pp</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 órás</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation type="unfinished">24 órás</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation type="unfinished">12 órás</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation type="unfinished">Dátumformátum</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation type="unfinished">A hét kezdőnapja</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished">Vasárnap</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished">Hétfő</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation>Időzóna</translation>
+        <translation type="obsolete">Időzóna</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Dátum</translation>
+        <translation type="obsolete">Dátum</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Időformátum</translation>
+        <translation type="obsolete">Időformátum</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 órás</translation>
+        <translation type="obsolete">24 órás</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 órás</translation>
+        <translation type="obsolete">12 órás</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>A hét kezdőnapja</translation>
+        <translation type="obsolete">A hét kezdőnapja</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Vasárnap</translation>
+        <translation type="obsolete">Vasárnap</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Hétfő</translation>
+        <translation type="obsolete">Hétfő</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Dátumformátum</translation>
+        <translation type="obsolete">Dátumformátum</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Kisalkalmazás formátum</translation>
+        <translation type="obsolete">Kisalkalmazás formátum</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>óó:pp</translation>
+        <translation type="obsolete">óó:pp</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>N/H óó:pp</translation>
+        <translation type="obsolete">N/H óó:pp</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>H/N óó:pp</translation>
+        <translation type="obsolete">H/N óó:pp</translation>
     </message>
     <message>
         <source>Set System Time</source>
-        <translation>Rendszeridő beállítása</translation>
+        <translation type="obsolete">Rendszeridő beállítása</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
-        <translation>Óra</translation>
+        <translation type="obsolete">Óra</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Perc</translation>
+        <translation type="obsolete">Perc</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>De</translation>
+        <translation type="obsolete">De</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>Du</translation>
+        <translation type="obsolete">Du</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation type="unfinished">Óra</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="unfinished">Perc</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="unfinished">De</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="unfinished">Du</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Dátum</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/advancedfm.ts b/i18n/it/advancedfm.ts
index a73662b..969e0cf 100644
--- a/i18n/it/advancedfm.ts
+++ b/i18n/it/advancedfm.ts
@@ -1,263 +1,344 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>La directory non esiste</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation>Advanced FileManager
+        <translation type="obsolete">Advanced FileManager
 copyright 2002 di
 L.J.Potter &lt;llornkcor@handhelds.org&gt;
 sotto licenza GPL</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostra File Nascosti</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Esegui</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Apri come testo</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crea Directory</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crea Link Simbolico</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copia Come</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copia Stessa Dir</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Muovi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Aggiungi a Documenti</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Esegui Comando</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info File</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Imposta Permessi</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Trasmetti File via IrDA</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Esegui Comando con Output</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Cambia su Locale</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Cambia su Remoto</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>Informazioni</translation>
+        <translation type="obsolete">Informazioni</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Vuoi veramente cancellare
+        <translation type="obsolete">Vuoi veramente cancellare
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossibile rinominare</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
-        <translation> già esiste
+        <translation type="obsolete"> già esiste
 Vuoi veramente cancellarlo?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Impossibile copiare
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>to
 </translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copia</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Come</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Impossibile spostare
 </translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Output AdvancedFm</translation>
     </message>
     <message>
         <source>command failed!</source>
-        <translation>commando fallito!</translation>
+        <translation type="obsolete">commando fallito!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <translation type="obsolete">&amp;OK</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Trasmissione Advancedfm</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir eseguito.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished">Advanced FileManager
+copyright 2002-2003 di
+L.J.Potter &lt;llornkcor@handhelds.org&gt;
+sotto licenza GPL</translation>
+    </message>
+    <message>
+        <source>Change Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really delete
+%1 files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Directory?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really delete
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really copy
+%1 files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Exists!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 exists. Ok to overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not copy %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+exists. Ok to overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> already exists.
+Do you really want to delete it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salva output su file (solo nome)</translation>
     </message>
+    <message>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Imposta Permessi File</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Imposta permessi file per:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>proprietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>altri</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Proprietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lettura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>scrittura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>esecuzione</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/aqpkg.ts b/i18n/it/aqpkg.ts
index c8c2ef4..6715b79 100644
--- a/i18n/it/aqpkg.ts
+++ b/i18n/it/aqpkg.ts
@@ -1,548 +1,591 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished">Filtro Categoria</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lettura configurazione...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destinazione</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished">Spazio Disp.</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">Output</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Inizia</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Opzioni</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished">Opzioni</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">Forza Dipendenze</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">Forza Rinstallazione</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">Forza Eliminazione</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">Forza Sovrascrittura</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestore Pacchetti</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Inserisci qui il testo da cercare.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Clicca qui per nascondere la toolbar &quot;Quick Jump&quot;.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Aggiorna liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Clicca qui per aggiornare le liste dei pacchetti dai server.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Clicca qui per fare l&apos;upgrade di tutti i pacchetti installati se è disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Clicca qui per fare il download dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Applica modifiche</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Clicca qui per installare, eliminare o fare l&apos;upgrade dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostra i pacchetti non installati</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Clicca qui per visualizzare i pacchetti disponibili non ancora installati.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostra i pacchetti installati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Clicca qui per visualizzare i pacchetti installati su questo dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostra i pacchetti aggiornati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Clicca qui per visualizzare i pacchetti installati su questo dispositivo che hanno disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtra per categoria</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Clicca qui per visualizzare i pacchetti appartenenti ad una categoria.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Imposta filtro per categoria</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Clicca qui per cambiare la categoria utilizzata per il filtro dei pacchetti.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Clicca qui per cercare del testo nei nomi dei pacchetti.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Trova successivo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Clicca qui per trovare il successivo nome del pacchetto che contiene il testo che stai cercando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Tastiera &quot;Quick Jump&quot;</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Clicca qui per mostrare/nascondere la tastiera per muoversi velocemente nella lista dei pacchetti.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Clicca qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Clicca qui per nascondere la toolbar di ricerca.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Clicca qui per selezionare un server per i pacchetti.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pacchetti</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Questa è la lista di tutti i pacchetti del server selezionato sopra.
 
 Un punto blu dopo il nome del pacchetto indica che il pacchetto è installato.
 
 Un punto blu con una stella indica che è disponibile sul server una nuova versione del pacchetto .
 
 Clicca dentro il box sulla sinistra per selezionare un pacchetto.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Clicca qui per disinstallare i pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista server:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista pacchetti per:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
-        <translation>Installato Su - %1</translation>
+        <translation type="obsolete">Installato Su - %1</translation>
     </message>
     <message>
         <source>Description - %1</source>
-        <translation>Descrizione - %1</translation>
+        <translation type="obsolete">Descrizione - %1</translation>
     </message>
     <message>
         <source>Size - %1</source>
-        <translation>Dimensione - %1</translation>
+        <translation type="obsolete">Dimensione - %1</translation>
     </message>
     <message>
         <source>Section - %1</source>
-        <translation>Sezione - %1</translation>
+        <translation type="obsolete">Sezione - %1</translation>
     </message>
     <message>
         <source>Filename - %1</source>
-        <translation>Nome File - %1</translation>
+        <translation type="obsolete">Nome File - %1</translation>
     </message>
     <message>
         <source>V. Installed - %1</source>
-        <translation>V. Installata - %1</translation>
+        <translation type="obsolete">V. Installata - %1</translation>
     </message>
     <message>
         <source>V. Available - %1</source>
-        <translation>V. Disponibile - %1</translation>
+        <translation type="obsolete">V. Disponibile - %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Aggiornamento liste pacchetti dal server</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATTENZIONE: Fare l&apos;upgrade
 mentre Opie/Qtopia è in esecuzione
 è SCONSIGLIATO!
 
 Sei sicuro?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Aggiornamento pacchetti installati</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Sei sicuro di voler eliminare
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Download su dove</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Inserisci path per download su</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installa Pacchetto Remoto</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Inserisci posizione pacchetto</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Niente da fare</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Nessun pacchetto selezionato</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Vuoi eliminare o rinstallare
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Elimina o Rinstalla</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Rinstalla</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vuoi eliminare o fare l&apos;upgrade di
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Elimina o Upgrade</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Chiudi</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">Configurazione</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished">Destinazioni</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">Proxy</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Nuovo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished">Server Attivo</translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Destinazione</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">Abilitato</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/keypebble.ts b/i18n/it/keypebble.ts
index 0f47b9e..2e116a0 100644
--- a/i18n/it/keypebble.ts
+++ b/i18n/it/keypebble.ts
@@ -1,240 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Connesso</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Connessione Rifiutata</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Host non trovato</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Errore in Lettura: QSocket ha trovato un errore leggendo
 i dati, l&apos;host remoto ha probabilmente chiuso la
 connessione.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket ha trovato un codice di errore invalido</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation>In attesa per inizializzazione server...</translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>In attesa per nome desktop...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Connesso a %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Errore di Protocollo: Trovato Id Messaggio %1 mentre si attendeva un messaggio di aggiornamento.</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Errore di Protocollo: Il server %1 utilizza una codifica sconosciuta</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>In attesa della versione del server...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Errore: Versione del server errata, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Errore: Versione del server non supportata, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Autenticato</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Errore: Il server richiede una password, però non è stata specificata.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Errore: La password inserita non è corretta.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Errore: Sono stati effettuati troppi tentativi di accesso non autorizzati
 per questo account, riprovare più tardi.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Autenticazione Fallita</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Troppi tentativi falliti</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Viewer</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nuova Connessione</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Apri Bookmark</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Cancella Bookmark</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Schermo Intero</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Invia Ctrl-Alt-Canc</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Disconnesso</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Chiudi Schermo Intero</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Connesso al server remoto</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Autenticato sul server remoto</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connessione chiusa</translation>
     </message>
+    <message>
+        <source>Next Click is Double Click</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next Click is Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Bookmark</translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>Connessione VNC Viewer</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Mostra Password</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Nome Bookmark:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Nome Server:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Numero Display:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Controlla aggiornamenti dello schermo ogni:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Millisecondi</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Richiesta sessione a 8-bit</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Sveglia con sonoro</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Richiesta sessione distribuita</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Fattore di Scala</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Codifiche</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Codifica Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>Codifica CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>Codifica RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Copia codifica rettangolo</translation>
     </message>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/language.ts b/i18n/it/language.ts
index 91c2f12..530210f 100644
--- a/i18n/it/language.ts
+++ b/i18n/it/language.ts
@@ -1,13 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
-        <translation>Lingua</translation>
+        <translation type="obsolete">Lingua</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Seleziona lingua</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/libbatteryapplet.ts b/i18n/it/libbatteryapplet.ts
index 17ab067..c4740d8 100644
--- a/i18n/it/libbatteryapplet.ts
+++ b/i18n/it/libbatteryapplet.ts
@@ -1,61 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Battery Status</source>
-        <translation>Stato Batteria</translation>
+        <translation type="obsolete">Stato Batteria</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>In carica</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Percentuale batteria rimasta</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Stato batteria:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Buono</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Basso</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Molto Basso</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Critico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Carica di riserva</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Alimentazione esterna inserita</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentazione esterna disinserita</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Tempo batteria rimasto</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/libhomeapplet.ts b/i18n/it/libhomeapplet.ts
index 1e74a8c..531e254 100644
--- a/i18n/it/libhomeapplet.ts
+++ b/i18n/it/libhomeapplet.ts
@@ -1,13 +1,17 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation>Shortcut Home</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation>Home</translation>
+        <translation type="obsolete">Home</translation>
+    </message>
+    <message>
+        <source>Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libliquid.ts b/i18n/it/libliquid.ts
index 953f986..14e3060 100644
--- a/i18n/it/libliquid.ts
+++ b/i18n/it/libliquid.ts
@@ -1,71 +1,78 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Stile Liquid</translation>
+        <translation type="unfinished">Stile Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>No trasparenza</translation>
+        <translation type="unfinished">No trasparenza</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Colore sfondo
+        <translation type="unfinished">Colore sfondo
 </translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Colore bottone
+        <translation type="unfinished">Colore bottone
 </translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Colore sfondo trasparente</translation>
+        <translation type="unfinished">Colore sfondo trasparente</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Colore bottone trasparente
+        <translation type="unfinished">Colore bottone trasparente
 </translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Trasparenza personalizzata</translation>
+        <translation type="unfinished">Trasparenza personalizzata</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Colore menu</translation>
+        <translation type="unfinished">Colore menu</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Colore testo</translation>
+        <translation type="unfinished">Colore testo</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opacità</translation>
+        <translation type="unfinished">Opacità</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usa testo menu ombreggiato</translation>
+        <translation type="unfinished">Usa testo menu ombreggiato</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Bottoni barra applicazioni senza rilievo</translation>
+        <translation type="unfinished">Bottoni barra applicazioni senza rilievo</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Contrasto</translation>
+        <translation type="unfinished">Contrasto</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Stile Liquid ad alte prestazione by Mosfet</translation>
+        <translation type="unfinished">Stile Liquid ad alte prestazione by Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libopie.ts b/i18n/it/libopie.ts
index eb41edc..d03ea63 100644
--- a/i18n/it/libopie.ts
+++ b/i18n/it/libopie.ts
@@ -1,471 +1,562 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
     <message>
         <source>More</source>
-        <translation>Ancora</translation>
+        <translation type="obsolete">Ancora</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Ancora...</translation>
+        <translation type="obsolete">Ancora...</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
-        <translation>Tinta:</translation>
+        <translation type="obsolete">Tinta:</translation>
     </message>
     <message>
         <source>Sat:</source>
-        <translation>Sat:</translation>
+        <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation>Val:</translation>
+        <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation>Rosso:</translation>
+        <translation type="obsolete">Rosso:</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation>Verde:</translation>
+        <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation>Blu:</translation>
+        <translation type="obsolete">Blu:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation>Alpha channel:</translation>
+        <translation type="obsolete">Alpha channel:</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation>Seleziona colore</translation>
+        <translation type="obsolete">Seleziona colore</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>FileDialog</translation>
+        <translation type="obsolete">FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Apri</translation>
+        <translation type="obsolete">Apri</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Salva</translation>
+        <translation type="obsolete">Salva</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
-        <translation>Documenti</translation>
+        <translation type="obsolete">Documenti</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation>File</translation>
+        <translation type="obsolete">File</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation>Tutti i File</translation>
+        <translation type="obsolete">Tutti i File</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Tutti</translation>
+        <translation type="obsolete">Tutti</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nome:</translation>
+        <translation type="obsolete">Nome:</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Salva</translation>
+        <translation type="obsolete">&amp;Salva</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
-        <translation>C&amp;ancella</translation>
+        <translation type="obsolete">C&amp;ancella</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Dimensione</translation>
+        <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation>Mime Type</translation>
+        <translation type="obsolete">Mime Type</translation>
     </message>
     <message>
         <source>Ser Permission</source>
-        <translation>Imposta Permessi</translation>
+        <translation type="obsolete">Imposta Permessi</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Cancella</translation>
+        <translation type="obsolete">Cancella</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Vuoi veramente cancellare</translation>
+        <translation type="obsolete">Vuoi veramente cancellare</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sì</translation>
+        <translation type="obsolete">Sì</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>No</translation>
+        <translation type="obsolete">No</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation>Grande</translation>
+        <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Medio</translation>
+        <translation type="obsolete">Medio</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation>Piccolo</translation>
+        <translation type="obsolete">Piccolo</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stile</translation>
+        <translation type="obsolete">Stile</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Dimensione</translation>
+        <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
+        <translation type="obsolete">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
+    </message>
+</context>
+<context>
+    <name>ORecurranceBase</name>
+    <message>
+        <source>Repeating Event </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End On:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
-        <translation>TimePicker</translation>
+        <translation type="obsolete">TimePicker</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Orario:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Scegli l&apos;Orario:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
-        <translation>Summario:</translation>
+        <translation type="obsolete">Summario:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Descrizione:</translation>
+        <translation type="obsolete">Descrizione:</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Priorità:</translation>
+        <translation type="obsolete">Priorità:</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Avanzamento:</translation>
+        <translation type="obsolete">Avanzamento:</translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation>Scadenza:</translation>
+        <translation type="obsolete">Scadenza:</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Categoria:</translation>
+        <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Alarmed Notification:</source>
-        <translation>Avviso Sonoro:</translation>
+        <translation type="obsolete">Avviso Sonoro:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
-        <translation>Indirizzi Email: </translation>
+        <translation type="obsolete">Indirizzi Email: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
-        <translation>Telefono Casa: </translation>
+        <translation type="obsolete">Telefono Casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation>Fax Casa: </translation>
+        <translation type="obsolete">Fax Casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
-        <translation>Cellulare Casa: </translation>
+        <translation type="obsolete">Cellulare Casa: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation>Pagina Web Casa: </translation>
+        <translation type="obsolete">Pagina Web Casa: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation>Pagina Web Ufficio: </translation>
+        <translation type="obsolete">Pagina Web Ufficio: </translation>
     </message>
     <message>
         <source>Office: </source>
-        <translation>Ufficio: </translation>
+        <translation type="obsolete">Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation>Telefono Ufficio: </translation>
+        <translation type="obsolete">Telefono Ufficio: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation>Fax Ufficio: </translation>
+        <translation type="obsolete">Fax Ufficio: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation>Cellulare Ufficio: </translation>
+        <translation type="obsolete">Cellulare Ufficio: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation>Cercapersone Ufficio: </translation>
+        <translation type="obsolete">Cercapersone Ufficio: </translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation>Professione: </translation>
+        <translation type="obsolete">Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation>Assistente: </translation>
+        <translation type="obsolete">Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation>Direttore: </translation>
+        <translation type="obsolete">Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
-        <translation>Maschile</translation>
+        <translation type="obsolete">Maschile</translation>
     </message>
     <message>
         <source>Female</source>
-        <translation>Femminile</translation>
+        <translation type="obsolete">Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
-        <translation>Sesso: </translation>
+        <translation type="obsolete">Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
-        <translation>Coniuge: </translation>
+        <translation type="obsolete">Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
-        <translation>Compleanno: </translation>
+        <translation type="obsolete">Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
-        <translation>Anniversario: </translation>
+        <translation type="obsolete">Anniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
-        <translation>Alias: </translation>
+        <translation type="obsolete">Alias: </translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titolo</translation>
+        <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Secondo Nome</translation>
+        <translation type="obsolete">Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Cognome</translation>
+        <translation type="obsolete">Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Suffisso</translation>
+        <translation type="obsolete">Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Visualizza Come</translation>
+        <translation type="obsolete">Visualizza Come</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Titolo</translation>
+        <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Dipartimento</translation>
+        <translation type="obsolete">Dipartimento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Società</translation>
+        <translation type="obsolete">Società</translation>
     </message>
     <message>
         <source>Business Phone</source>
-        <translation>Telefono Ufficio</translation>
+        <translation type="obsolete">Telefono Ufficio</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax Ufficio</translation>
+        <translation type="obsolete">Fax Ufficio</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Cellulare Ufficio</translation>
+        <translation type="obsolete">Cellulare Ufficio</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Email Principale</translation>
+        <translation type="obsolete">Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Altre Email</translation>
+        <translation type="obsolete">Altre Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Telefono Casa</translation>
+        <translation type="obsolete">Telefono Casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax Casa</translation>
+        <translation type="obsolete">Fax Casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Cellulare Casa</translation>
+        <translation type="obsolete">Cellulare Casa</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Indirizzo Ufficio</translation>
+        <translation type="obsolete">Indirizzo Ufficio</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Città Ufficio</translation>
+        <translation type="obsolete">Città Ufficio</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Provincia Ufficio</translation>
+        <translation type="obsolete">Provincia Ufficio</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>CAP Ufficio</translation>
+        <translation type="obsolete">CAP Ufficio</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Paese Ufficio</translation>
+        <translation type="obsolete">Paese Ufficio</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Cercapersone Ufficio</translation>
+        <translation type="obsolete">Cercapersone Ufficio</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Pagina Web Ufficio</translation>
+        <translation type="obsolete">Pagina Web Ufficio</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Ufficio</translation>
+        <translation type="obsolete">Ufficio</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Professione</translation>
+        <translation type="obsolete">Professione</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistente</translation>
+        <translation type="obsolete">Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Direttore</translation>
+        <translation type="obsolete">Direttore</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Indirizzo Casa</translation>
+        <translation type="obsolete">Indirizzo Casa</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Città Casa</translation>
+        <translation type="obsolete">Città Casa</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Provincia Casa</translation>
+        <translation type="obsolete">Provincia Casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>CAP Casa</translation>
+        <translation type="obsolete">CAP Casa</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Paese Casa</translation>
+        <translation type="obsolete">Paese Casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Pagina Web Casa</translation>
+        <translation type="obsolete">Pagina Web Casa</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Coniuge</translation>
+        <translation type="obsolete">Coniuge</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Sesso</translation>
+        <translation type="obsolete">Sesso</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Compleanno</translation>
+        <translation type="obsolete">Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Anniversario</translation>
+        <translation type="obsolete">Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Alias</translation>
+        <translation type="obsolete">Alias</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Figli</translation>
+        <translation type="obsolete">Figli</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Note</translation>
+        <translation type="obsolete">Note</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation>Gruppi</translation>
+        <translation type="obsolete">Gruppi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libopieobex.ts b/i18n/it/libopieobex.ts
index d90bd50..af1c8b4 100644
--- a/i18n/it/libopieobex.ts
+++ b/i18n/it/libopieobex.ts
@@ -1,50 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ObexDlg</name>
     <message>
         <source>OBEX Sending</source>
-        <translation>Trasmissione OBEX</translation>
+        <translation type="obsolete">Trasmissione OBEX</translation>
     </message>
     <message>
         <source>Sending:</source>
-        <translation>Trasmissione:</translation>
+        <translation type="obsolete">Trasmissione:</translation>
     </message>
     <message>
         <source>filename</source>
-        <translation>nome file</translation>
+        <translation type="obsolete">nome file</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Cancella</translation>
+        <translation type="obsolete">&amp;Cancella</translation>
     </message>
 </context>
 <context>
     <name>ObexInc</name>
     <message>
         <source>OBEX Receiving</source>
-        <translation>Ricezione OBEX</translation>
+        <translation type="obsolete">Ricezione OBEX</translation>
     </message>
     <message>
         <source>TextLabel1</source>
-        <translation>TextLabel1</translation>
+        <translation type="obsolete">TextLabel1</translation>
     </message>
     <message>
         <source>Filename</source>
-        <translation>Nome File</translation>
+        <translation type="obsolete">Nome File</translation>
     </message>
     <message>
         <source>A file was beamed 
 to you.</source>
-        <translation>Un file ti è stato 
+        <translation type="obsolete">Un file ti è stato 
 trasmesso.</translation>
     </message>
     <message>
         <source>Insert</source>
-        <translation>Inserisci</translation>
+        <translation type="obsolete">Inserisci</translation>
     </message>
     <message>
         <source>Reject</source>
-        <translation>Rifiuta</translation>
+        <translation type="obsolete">Rifiuta</translation>
+    </message>
+</context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqdvorak.ts b/i18n/it/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/it/libqdvorak.ts
+++ b/i18n/it/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libqhandwriting.ts b/i18n/it/libqhandwriting.ts
index 5d6a20c..b41e15a 100644
--- a/i18n/it/libqhandwriting.ts
+++ b/i18n/it/libqhandwriting.ts
@@ -1,136 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>Aiuto Calligrafia</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;Quando usi il riconoscimento automatico della calligrafia scrivi lentamente, accuratamente e con fermezza.&lt;li&gt;Quando disegni i tuoi caratteri utilizza le linee guida.&lt;li&gt;Quando disegni un carattere con più segni, ognuno di questi deve essere disegnato prima che scompaiano i segni grigi.&lt;li&gt;Fai pratica utilizzando il Trainer.&lt;li&gt;Quando inserisci un tuo nuovo carattere assicurati che sia sufficentemente diverso dai caratteri già presenti.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Suggerimenti</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Trainer</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation>Seleziona un carattere dall&apos;elenco.  L&apos;area per scrivere sulla sinistra mostra un carattere di riferimento.  Fai pratica scrivendo nell&apos;area sulla destra.</translation>
+        <translation type="obsolete">Seleziona un carattere dall&apos;elenco.  L&apos;area per scrivere sulla sinistra mostra un carattere di riferimento.  Fai pratica scrivendo nell&apos;area sulla destra.</translation>
     </message>
     <message>
         <source>Matched: </source>
         <translation>Trovati: </translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Simili a: </translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Nuovo...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Cancella</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Inserisci un nuovo carattere</translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
-        <translation>Form1</translation>
+        <translation type="obsolete">Form1</translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation>Timeout carattere con più segni:</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>Aree di inserimento visualizzate</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>Aree caratteri maiuscoli e minuscoli</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>Caratteri Minuscoli (cambia Caratteri Maiuscoli)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Impostazioni Inserimento Calligrafia</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Profilo Carattere:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personalizza</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio esaurito</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossibile salvare le informazioni.
 Libera dello spazio
 e ritenta.
 
 Esci lo stesso?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqjumpx.ts b/i18n/it/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/it/libqjumpx.ts
+++ b/i18n/it/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libqkeyboard.ts b/i18n/it/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/it/libqkeyboard.ts
+++ b/i18n/it/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libqkjumpx.ts b/i18n/it/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/it/libqkjumpx.ts
+++ b/i18n/it/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libqpickboard.ts b/i18n/it/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/it/libqpickboard.ts
+++ b/i18n/it/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libscreenshotapplet.ts b/i18n/it/libscreenshotapplet.ts
index 6c42cbd..2ed8a9b 100644
--- a/i18n/it/libscreenshotapplet.ts
+++ b/i18n/it/libscreenshotapplet.ts
@@ -1,17 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Snapshot</source>
-        <translation>Snapshot</translation>
+        <translation type="obsolete">Snapshot</translation>
     </message>
     <message>
         <source>scap</source>
-        <translation>scap</translation>
+        <translation type="obsolete">scap</translation>
     </message>
     <message>
         <source>Name of screenshot </source>
         <translation>Nome dello screenshot</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>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screenshot was uploaded to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection to %1 failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/mediummount.ts b/i18n/it/mediummount.ts
index 7fcae73..6fb21e1 100644
--- a/i18n/it/mediummount.ts
+++ b/i18n/it/mediummount.ts
@@ -1,87 +1,99 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation>Globale</translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation>Se un supporto viene inserito in questo dispositivo, Opie vi cercherà dei Documenti. Su supporti molto grandi la ricerca impiegherà più tempo. Puoi scegliere se Opie deve cercare i Documenti in modo globale o in base al supporto. Potrai inoltre riconfigurare ogni supporto.</translation>
+        <translation type="obsolete">Se un supporto viene inserito in questo dispositivo, Opie vi cercherà dei Documenti. Su supporti molto grandi la ricerca impiegherà più tempo. Puoi scegliere se Opie deve cercare i Documenti in modo globale o in base al supporto. Potrai inoltre riconfigurare ogni supporto.</translation>
     </message>
     <message>
         <source>Enable medium checking</source>
         <translation>Abilita controllo sui supporti</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Usa impostazioni globali</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Quale file multimediale</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation>Quake file multimediale</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limita ricerca a:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Controlla sempre questo supporto</translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/oipkg.ts b/i18n/it/oipkg.ts
index 19a7996..ffb4cfd 100644
--- a/i18n/it/oipkg.ts
+++ b/i18n/it/oipkg.ts
@@ -1,361 +1,369 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation>Installa</translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation>Opzioni ipkg</translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation>-force-depends</translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation>-force-reinstall</translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation>-force-removal-of-essential-packages</translation>
     </message>
     <message>
         <source>-force-overwrite</source>
         <translation>-force-overwrite</translation>
     </message>
     <message>
         <source>To remove</source>
         <translation>Per rimuovere</translation>
     </message>
     <message>
         <source>To install</source>
         <translation>Per installare</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation>Package Manager</translation>
     </message>
     <message>
         <source>feeds</source>
         <translation>feed</translation>
     </message>
     <message>
         <source>ipkgfind&amp;killefiz</source>
         <translation>ipkgfind&amp;killefiz</translation>
     </message>
     <message>
         <source>documents</source>
         <translation>documenti</translation>
     </message>
     <message>
         <source>Package</source>
         <translation>Pacchetto</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Applica</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Aggiorna</translation>
     </message>
     <message>
         <source>Setups</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servers</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinazioni</translation>
     </message>
     <message>
         <source>Section:</source>
         <translation>Sezione:</translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation>Chiudi Sezione</translation>
     </message>
     <message>
         <source>Sections</source>
         <translation>Sezioni</translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation>Filtro: </translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation>Cancella Trova</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Chiudi Trova</translation>
     </message>
     <message>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
         <source>Search: </source>
         <translation>Cerca:</translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation>Cancella Cerca</translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation>Ricerca</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation>Destinazione: </translation>
     </message>
     <message>
         <source>Link</source>
         <translation>Link</translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation>Chiudi Destinazioni</translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation>Operazioni Pacchetti</translation>
     </message>
     <message>
         <source>Install</source>
         <translation>Installa</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation>Stato Pacchetti</translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation>Nuova versione, installata</translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation>Nuova versione, non installata</translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation>Vecchia versione, installata</translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation>Vecchia versione, non installata</translation>
     </message>
     <message>
         <source>Old version, new version installed</source>
         <translation>Vecchia versione, nuova versione installata</translation>
     </message>
     <message>
         <source>New version, old version installed</source>
         <translation>Nuova versione, vecchia versione installata</translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation>Paccketto</translation>
     </message>
     <message>
         <source>Install to</source>
-        <translation>Installa su</translation>
+        <translation type="obsolete">Installa su</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Rimuovi</translation>
+        <translation type="obsolete">Rimuovi</translation>
     </message>
     <message>
         <source>Reinstall</source>
-        <translation>Rinstalla</translation>
+        <translation type="obsolete">Rinstalla</translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation>Server Pacchetti</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation>Destinazione installazione:</translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation>Destinazione linkata su root</translation>
     </message>
     <message>
         <source>Used servers: (Highlighted feeds are active)</source>
         <translation>Server usati: (I feed evidenziati sono attivi)</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinazioni</translation>
     </message>
     <message>
         <source>link to /</source>
         <translation>link su /</translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation>Rimuovi link</translation>
     </message>
     <message>
         <source>volatile</source>
         <translation>volatile</translation>
     </message>
     <message>
         <source>removeable</source>
         <translation>removibile</translation>
     </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation>
 Fatto.</translation>
     </message>
     <message>
         <source>Removing</source>
         <translation>Rimuovo</translation>
     </message>
     <message>
         <source>please wait</source>
         <translation>attendere</translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation>Errore nella rimozione </translation>
     </message>
     <message>
         <source>Installing</source>
         <translation>Installo</translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation>Errore nell&apos;installazione</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation>Descrizione: </translation>
     </message>
     <message>
         <source>Size: </source>
         <translation>Dimensione: </translation>
     </message>
     <message>
         <source>other</source>
         <translation>altro</translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation>Nome Installazione: </translation>
     </message>
     <message>
         <source> on </source>
         <translation>su</translation>
     </message>
     <message>
         <source>Name: </source>
         <translation>Nome: </translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Link: </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation>Destinazione: </translation>
     </message>
     <message>
         <source>Status: </source>
         <translation>Stato: </translation>
     </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished">Installa su</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished">Rimuovi</translation>
+    </message>
 </context>
 <context>
     <name>RunWindow</name>
     <message>
         <source>running...</source>
         <translation>in esecuzione...</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/opieftp.ts b/i18n/it/opieftp.ts
index 7b1a551..c2f36cf 100644
--- a/i18n/it/opieftp.ts
+++ b/i18n/it/opieftp.ts
@@ -1,254 +1,254 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connessione</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Locale</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Remota</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuova</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Connetti</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Disconnetti</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostra File Nascosti</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Upload</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crea Directory</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Cambia su Locale</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Cambia su Remoto</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Cambia su Config</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>Informazioni</translation>
+        <translation type="obsolete">Informazioni</translation>
     </message>
     <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Dir</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Username</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Server remoto</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Path remoto</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Config</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Imposta le info del server</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Impossibile connettersi a
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Impossibile autenticarsi su
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Impossibile fare l&apos;upload di
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Impossibile fare l&apos;upload delle directory</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Impossibile fare il download di
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Impossibile visualizzare elenco file di
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Impossibile cambiare directory
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Impossibile salire di livello
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Impossibile ottenere la directory di lavoro
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambia Directory</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Riesamina</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Vuoi veramente eliminare
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 Deve essere vuota</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Impossibile creare directory
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Impossibile eliminare directory
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Impossibile eliminare file
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Impossibile rinominare file
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossibile rinominare</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Questa directory non esiste</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Nuovo Server</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Nome già esistente</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/oxygen.ts b/i18n/it/oxygen.ts
index 62093c7..f5564da 100644
--- a/i18n/it/oxygen.ts
+++ b/i18n/it/oxygen.ts
@@ -1,563 +1,567 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcola</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso Molecolare</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso Molecolare (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composizione Molecolare (%):</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Formula Chimica</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
-        <translation>Peso</translation>
+        <translation type="obsolete">Peso</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Blocco</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elettronegatività</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Raggio atomico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energ. ionizzazione</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densità</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Punto ebollizione</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Punto fusione</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Ossigeno</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Dati</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Calcoli</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Idrogeno</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Elio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Litio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berillio</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbonio</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Azoto</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluoro</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Alluminio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicio</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fosforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Zolfo</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potassio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcio</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titanio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadio</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Cromo</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganese</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Ferro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nichel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Rame</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinco</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gallio</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsenico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selenio</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Crypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidio</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Stronzio</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Ittrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconio</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molibdeno</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Tecnezio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Rutenio</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rodio</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Argento</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmio</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indio</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Stagno</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimonio</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellurio</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iodio</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xeno</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cesio</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Bario</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantanio</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerio</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodimio</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodimio</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promezio</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samario</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinio</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Disprosio</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Olmio</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbio</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Tulio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Itterbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutezio</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Afnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantalio</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Tungsteno</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Renio</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmio</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridio</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platino</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Oro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercurio</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Tallio</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Piombo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonio</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astato</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francio</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radio</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Attinio</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Torio</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protoattinio</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uranio</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Nettunio</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonio</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Americio</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curio</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berkelio</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californio</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einsteinio</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermio</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendelevio</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobelio</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Laurenzio</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordio</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnio</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgio</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrio</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassio</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerio</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Tavola Periodica</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>ERRORE: 
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Dati Chimici</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index a389f80..af5cb1f 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -1,249 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Tocca le crocette accuratamente e
 con decisione per tarare il tuo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Benvenuto in Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Documenti</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Mostra Lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Il livello della batteria è critico!
 Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>La batteria si sta scaricando.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>La batteria di Back-up si sta scaricando.
 Cambiarla subito.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>biglietto da visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informazione</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>&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Stato Batteria</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nessuna applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 file</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Tutti i tipi di file</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Mostra Documento</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Supporto inserito</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Un &lt;b&gt;supporto riscrivibile&lt;/b&gt; è stato inserito. Deve essere esaminato?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Quale file</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Link applicazioni</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Limita ricerca alla dir: (non ancora usata)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>La tua scelta verrà inserita sul supporto.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Non chiedere nuovamente per questo supporto</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Chiudi Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Riavvia</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Riavvia Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Sospendi</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>&lt;p&gt;
 Queste opzioni di chiusura sono state inserite principalmente per sviluppo e test di Opie. Per un uso normale, queste opzioni non sono necessarie.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Sospendi...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Sync Connessione</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>&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se stai utilizzando una versione di Qtopia Desktop più vecchia della 1.5.1, fai l&apos;upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Nega</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>&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se hai appena iniziato un Sync per la prima volta, questo è normale.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Permetti</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sincronizzazione</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contatti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/security.ts b/i18n/it/security.ts
index 5ae7c60..0401526 100644
--- a/i18n/it/security.ts
+++ b/i18n/it/security.ts
@@ -1,103 +1,107 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Imposta password</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambia password</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Password errata</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>La password inserita è sbagliata.
 Accesso negato</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Inserisci nuova password</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Rinserisci nuova password</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Impostazioni Sicurezza</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambia password</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Cancella password</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Richiedi password all&apos;avvio</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accetta sync dalla rete:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (predefinita)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;La protezione mediante password fornisce un minimo livello di protezione dall&apos;accesso illegale del dispositivo.</translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/systemtime.ts b/i18n/it/systemtime.ts
index 72565d6..2970a32 100644
--- a/i18n/it/systemtime.ts
+++ b/i18n/it/systemtime.ts
@@ -1,81 +1,329 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation type="unfinished">Formato tempo</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation type="unfinished">hh:mm</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">D/M hh:mm</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/D hh:mm</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 ore</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation type="unfinished">24 ore</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation type="unfinished">12 ore</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation type="unfinished">Formato Data</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Settimane iniziano il</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished">Domenica</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished">Lunedì</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SetDateTime</name>
     <message>
         <source>Set System Time</source>
-        <translation>Imposta Orario di Sistema</translation>
+        <translation type="obsolete">Imposta Orario di Sistema</translation>
     </message>
     <message>
         <source>Time Zone</source>
-        <translation>Fuso Orario</translation>
+        <translation type="obsolete">Fuso Orario</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Formato tempo</translation>
+        <translation type="obsolete">Formato tempo</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 ore</translation>
+        <translation type="obsolete">24 ore</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 ore</translation>
+        <translation type="obsolete">12 ore</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Settimane iniziano il</translation>
+        <translation type="obsolete">Settimane iniziano il</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Domenica</translation>
+        <translation type="obsolete">Domenica</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Lunedì</translation>
+        <translation type="obsolete">Lunedì</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Formato Data</translation>
+        <translation type="obsolete">Formato Data</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Formato applet</translation>
+        <translation type="obsolete">Formato applet</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>hh:mm</translation>
+        <translation type="obsolete">hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>D/M hh:mm</translation>
+        <translation type="obsolete">D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/D hh:mm</translation>
+        <translation type="obsolete">M/D hh:mm</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
-        <translation>Ora</translation>
+        <translation type="obsolete">Ora</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Minuto</translation>
+        <translation type="obsolete">Minuto</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="obsolete">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="obsolete">PM</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation type="unfinished">Ora</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="unfinished">Minuto</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="unfinished">AM</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="unfinished">PM</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/aqpkg.ts b/i18n/ja/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/ja/aqpkg.ts
+++ b/i18n/ja/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/aqpkg.ts b/i18n/ko/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/ko/aqpkg.ts
+++ b/i18n/ko/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/aqpkg.ts b/i18n/no/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/no/aqpkg.ts
+++ b/i18n/no/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/aqpkg.ts b/i18n/pl/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/pl/aqpkg.ts
+++ b/i18n/pl/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libliquid.ts b/i18n/pl/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/pl/libliquid.ts
+++ b/i18n/pl/libliquid.ts
@@ -1,68 +1,71 @@
 <!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>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopieobex.ts b/i18n/pl/libopieobex.ts
index 99d06ec..5fda095 100644
--- a/i18n/pl/libopieobex.ts
+++ b/i18n/pl/libopieobex.ts
@@ -1,49 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
+    <name>OtherHandler</name>
     <message>
-        <source>OBEX Sending</source>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sending:</source>
+        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filename</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <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>ObexInc</name>
+    <name>SendWidget</name>
     <message>
-        <source>OBEX Receiving</source>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filename</source>
+        <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A file was beamed 
-to you.</source>
+        <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
+        <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reject</source>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/opieftp.ts b/i18n/pl/opieftp.ts
index c6b5a09..84477a9 100644
--- a/i18n/pl/opieftp.ts
+++ b/i18n/pl/opieftp.ts
@@ -1,253 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Polaczenia</translation>
     </message>
     <message>
         <source>Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Zdalne</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Polacz</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Rozlacz</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Pokaz ukryte pliki</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Zaladuj</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Nowy katalog</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Zmien nazwe</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Przelacz na lokalny</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Przelacz na zdalny</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Przelacz na konfiguracje</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Katalog</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Username</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Haslo</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Zdalny serwer</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Zdalna sciezka</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Prosze ustawic informacje o serwerze</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notatka</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Nie moge polaczyc do
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Nie moge sie zalogowac w
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Nie moge zaladowac
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Nie moge zaladowac katalogow</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Nie moge sciagnac
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Nie moge wylistowac katalogu
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Nie moge zmienic katalogow
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Nie moge zmienic katalogu w gore
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Nie moge pobrac katalogu
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zmien katalog</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Naprawde chcesz skasowac
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 To musi byc puste</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Nie moge utworzyc katalogu
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Nie moge usunac katalogu
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Nie moge usunac pliku
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Nie moge zmienic nazwy
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Nie moge zmienic nazwy</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ten katalog nie istnieje</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/oxygen.ts b/i18n/pl/oxygen.ts
index eaf68a3..c0003ef 100644
--- a/i18n/pl/oxygen.ts
+++ b/i18n/pl/oxygen.ts
@@ -1,561 +1,561 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Americium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Californium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index 87b424d..f692d4a 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -1,244 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></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"></translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/security.ts b/i18n/pl/security.ts
index 3022fee..417e182 100644
--- a/i18n/pl/security.ts
+++ b/i18n/pl/security.ts
@@ -1,102 +1,106 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Ustaw haslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Podaj haslo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Haslo bledne</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Haslo nieprawidlowe.
 Dostep zabroniony</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Ustawienia bezpieczenstwa</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Wyczysc haslo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Wymaj hasla po uruchomieniu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Akceptuj synchronizacje z sieci:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Haslo zabezpieczajace pozwala na minimalny poziom zabezpieczen do tego urzadzenia.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/systemtime.ts b/i18n/pl/systemtime.ts
index a6bfb67..1a94a08 100644
--- a/i18n/pl/systemtime.ts
+++ b/i18n/pl/systemtime.ts
@@ -1,271 +1,312 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Ntp</name>
+    <name>FormatTabWidget</name>
     <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
+        <source>Time format</source>
+        <translation type="unfinished">Format czasu</translation>
     </message>
     <message>
-        <source>Running:</source>
-        <translation type="unfinished"></translation>
+        <source>hh:mm</source>
+        <translation type="unfinished">gg:mm</translation>
     </message>
     <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">D/M gg:mm</translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>last [h]</source>
-        <translation type="unfinished"></translation>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 godzin</translation>
     </message>
     <message>
-        <source>offset [s]</source>
-        <translation type="unfinished"></translation>
+        <source>24 hour</source>
+        <translation type="unfinished">24 godziny</translation>
     </message>
     <message>
-        <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <source>12 hour</source>
+        <translation type="unfinished">12 godzin</translation>
     </message>
     <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <source>Date format</source>
+        <translation type="unfinished">Format daty</translation>
     </message>
     <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Tydzien zaczyna sie w</translation>
     </message>
     <message>
-        <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
+        <source>Sunday</source>
+        <translation type="unfinished">Niedziele</translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <source>Monday</source>
+        <translation type="unfinished">Poniedzialek</translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Predict</source>
+        <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
+        <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error while getting time form
- server</source>
+        <source>You asked for a delay of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
+        <source> minutes, but only </source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NtpBase</name>
     <message>
-        <source>Network Time</source>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get time from network</source>
+        <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Time:</source>
+        <source>Running:
+ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>nan</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time Shift:</source>
+        <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Time:</source>
+        <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Esimated Shift:</source>
+        <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predicted Time:</source>
+        <source>Error while getting time from
+ server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean shift:</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set predicted time</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
     <message>
-        <source>Predict time</source>
+        <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>as</source>
+        <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP server to get the time from the network.</source>
+        <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wait for </source>
+        <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
     <message>
-        <source>minutes until</source>
+        <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insure a delay of</source>
+        <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
+        <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set time</source>
+        <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manual</source>
+        <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predict</source>
+        <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced settings</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation>Strefa czasowa</translation>
+        <translation type="obsolete">Strefa czasowa</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Format czasu</translation>
+        <translation type="obsolete">Format czasu</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 godziny</translation>
+        <translation type="obsolete">24 godziny</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 godzin</translation>
+        <translation type="obsolete">12 godzin</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Tydzien zaczyna sie w</translation>
+        <translation type="obsolete">Tydzien zaczyna sie w</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Niedziele</translation>
+        <translation type="obsolete">Niedziele</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Poniedzialek</translation>
+        <translation type="obsolete">Poniedzialek</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Format daty</translation>
+        <translation type="obsolete">Format daty</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Format apletu</translation>
+        <translation type="obsolete">Format apletu</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>gg:mm</translation>
+        <translation type="obsolete">gg:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>D/M gg:mm</translation>
+        <translation type="obsolete">D/M gg:mm</translation>
+    </message>
+</context>
+<context>
+    <name>SetTime</name>
+    <message>
+        <source>Hour</source>
+        <translation type="obsolete">Godzin</translation>
     </message>
     <message>
-        <source>M/D hh:mm</source>
+        <source>Minute</source>
+        <translation type="obsolete">Minuta</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>System Time</source>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetTime</name>
+    <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation>Godzin</translation>
+        <translation type="unfinished">Godzin</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Minuta</translation>
+        <translation type="unfinished">Minuta</translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/aqpkg.ts b/i18n/pt/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/pt/aqpkg.ts
+++ b/i18n/pt/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libliquid.ts b/i18n/pt/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/pt/libliquid.ts
+++ b/i18n/pt/libliquid.ts
@@ -1,68 +1,71 @@
 <!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>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopieobex.ts b/i18n/pt/libopieobex.ts
index 99d06ec..5fda095 100644
--- a/i18n/pt/libopieobex.ts
+++ b/i18n/pt/libopieobex.ts
@@ -1,49 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
+    <name>OtherHandler</name>
     <message>
-        <source>OBEX Sending</source>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sending:</source>
+        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filename</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <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>ObexInc</name>
+    <name>SendWidget</name>
     <message>
-        <source>OBEX Receiving</source>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filename</source>
+        <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A file was beamed 
-to you.</source>
+        <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
+        <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reject</source>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/opieftp.ts b/i18n/pt/opieftp.ts
index 10f73cd..8f9d52e 100644
--- a/i18n/pt/opieftp.ts
+++ b/i18n/pt/opieftp.ts
@@ -1,239 +1,235 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/oxygen.ts b/i18n/pt/oxygen.ts
index eaf68a3..c0003ef 100644
--- a/i18n/pt/oxygen.ts
+++ b/i18n/pt/oxygen.ts
@@ -1,561 +1,561 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Americium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Californium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 4343e99..37db7fb 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -1,244 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></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"></translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>A sincronizar</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/security.ts b/i18n/pt/security.ts
index 13490c6..15ad6fb 100644
--- a/i18n/pt/security.ts
+++ b/i18n/pt/security.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/systemtime.ts b/i18n/pt/systemtime.ts
index c4ad1a3..c42ee76 100644
--- a/i18n/pt/systemtime.ts
+++ b/i18n/pt/systemtime.ts
@@ -1,271 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Ntp</name>
+    <name>FormatTabWidget</name>
     <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
+        <source>Time format</source>
+        <translation type="unfinished">Formato da Hora</translation>
     </message>
     <message>
-        <source>Running:</source>
-        <translation type="unfinished"></translation>
+        <source>hh:mm</source>
+        <translation type="unfinished">hh:mm</translation>
     </message>
     <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">D/M hh:mm</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/D hh:mm</translation>
     </message>
     <message>
-        <source>last [h]</source>
-        <translation type="unfinished"></translation>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 Horas</translation>
     </message>
     <message>
-        <source>offset [s]</source>
-        <translation type="unfinished"></translation>
+        <source>24 hour</source>
+        <translation type="unfinished">24 Horas</translation>
     </message>
     <message>
-        <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <source>12 hour</source>
+        <translation type="unfinished">12 Horas</translation>
     </message>
     <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <source>Date format</source>
+        <translation type="unfinished">Formato da data</translation>
     </message>
     <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Semana começa em</translation>
     </message>
     <message>
-        <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
+        <source>Sunday</source>
+        <translation type="unfinished">Domingo</translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <source>Monday</source>
+        <translation type="unfinished">Segunda</translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Predict</source>
+        <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
+        <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error while getting time form
- server</source>
+        <source>You asked for a delay of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
+        <source> minutes, but only </source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NtpBase</name>
     <message>
-        <source>Network Time</source>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get time from network</source>
+        <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Time:</source>
+        <source>Running:
+ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>nan</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time Shift:</source>
+        <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Time:</source>
+        <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Esimated Shift:</source>
+        <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predicted Time:</source>
+        <source>Error while getting time from
+ server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean shift:</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set predicted time</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
     <message>
-        <source>Predict time</source>
+        <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>as</source>
+        <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP server to get the time from the network.</source>
+        <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wait for </source>
+        <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
     <message>
-        <source>minutes until</source>
+        <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insure a delay of</source>
+        <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
+        <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set time</source>
+        <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manual</source>
+        <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predict</source>
+        <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced settings</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation>Fuso Horário</translation>
+        <translation type="obsolete">Fuso Horário</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Formato da Hora</translation>
+        <translation type="obsolete">Formato da Hora</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 Horas</translation>
+        <translation type="obsolete">24 Horas</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 Horas</translation>
+        <translation type="obsolete">12 Horas</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Semana começa em</translation>
+        <translation type="obsolete">Semana começa em</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Domingo</translation>
+        <translation type="obsolete">Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Segunda</translation>
+        <translation type="obsolete">Segunda</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Formato da data</translation>
+        <translation type="obsolete">Formato da data</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Formato da Hora</translation>
+        <translation type="obsolete">Formato da Hora</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>hh:mm</translation>
+        <translation type="obsolete">hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>D/M hh:mm</translation>
+        <translation type="obsolete">D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/D hh:mm</translation>
+        <translation type="obsolete">M/D hh:mm</translation>
+    </message>
+</context>
+<context>
+    <name>SetTime</name>
+    <message>
+        <source>Hour</source>
+        <translation type="obsolete">Hora</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="obsolete">Minuto</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="obsolete">AM</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="obsolete">PM</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>System Time</source>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetTime</name>
+    <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation>Hora</translation>
+        <translation type="unfinished">Hora</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Minuto</translation>
+        <translation type="unfinished">Minuto</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="unfinished">PM</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/aqpkg.ts b/i18n/pt_BR/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/pt_BR/aqpkg.ts
+++ b/i18n/pt_BR/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libliquid.ts b/i18n/pt_BR/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/pt_BR/libliquid.ts
+++ b/i18n/pt_BR/libliquid.ts
@@ -1,68 +1,71 @@
 <!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>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopieobex.ts b/i18n/pt_BR/libopieobex.ts
index 99d06ec..5fda095 100644
--- a/i18n/pt_BR/libopieobex.ts
+++ b/i18n/pt_BR/libopieobex.ts
@@ -1,49 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
+    <name>OtherHandler</name>
     <message>
-        <source>OBEX Sending</source>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sending:</source>
+        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filename</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <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>ObexInc</name>
+    <name>SendWidget</name>
     <message>
-        <source>OBEX Receiving</source>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filename</source>
+        <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A file was beamed 
-to you.</source>
+        <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
+        <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reject</source>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opieftp.ts b/i18n/pt_BR/opieftp.ts
index ef1b861..d26fd96 100644
--- a/i18n/pt_BR/opieftp.ts
+++ b/i18n/pt_BR/opieftp.ts
@@ -1,240 +1,236 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/oxygen.ts b/i18n/pt_BR/oxygen.ts
index eaf68a3..c0003ef 100644
--- a/i18n/pt_BR/oxygen.ts
+++ b/i18n/pt_BR/oxygen.ts
@@ -1,561 +1,561 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Americium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Californium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index b62c695..00ee54b 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -1,245 +1,253 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></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"></translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Contatos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Syncing</source>
         <translation type="unfinished">Sincronizando</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/security.ts b/i18n/pt_BR/security.ts
index ebda055..d9a927d 100644
--- a/i18n/pt_BR/security.ts
+++ b/i18n/pt_BR/security.ts
@@ -1,103 +1,107 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Any</source>
         <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar senha</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Senha incorreta</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entre a senha</translation>
     </message>
     <message>
         <source>Set passcode</source>
         <translation>Ajustar senha</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>A senha inserida está incorreta.
 Acesso negado</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Any</source>
         <translation type="unfinished">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished">Mudar a senha</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished">Ajustes</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished">Limpar a senha</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished">Requisitar senha ao ligar</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished">&lt;P&gt;A senha provê um nível mínimo de segurança quantra o acesso casual a este dispositivo.</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished">192.168.129.0/24 (padrão)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/systemtime.ts b/i18n/pt_BR/systemtime.ts
index 00096b4..4834641 100644
--- a/i18n/pt_BR/systemtime.ts
+++ b/i18n/pt_BR/systemtime.ts
@@ -1,272 +1,309 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Ntp</name>
+    <name>FormatTabWidget</name>
     <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
+        <source>Time format</source>
+        <translation type="unfinished">Formato de hora</translation>
     </message>
     <message>
-        <source>Running:</source>
+        <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error while executing ntpdate</source>
+        <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>last [h]</source>
-        <translation type="unfinished"></translation>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 horas</translation>
     </message>
     <message>
-        <source>offset [s]</source>
-        <translation type="unfinished"></translation>
+        <source>24 hour</source>
+        <translation type="unfinished">24 horas</translation>
     </message>
     <message>
-        <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <source>12 hour</source>
+        <translation type="unfinished">12 horas</translation>
     </message>
     <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <source>Date format</source>
+        <translation type="unfinished">Formato de data</translation>
     </message>
     <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Semana começa no(a)</translation>
     </message>
     <message>
-        <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
+        <source>Sunday</source>
+        <translation type="unfinished">Domingo</translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <source>Monday</source>
+        <translation type="unfinished">Segunda</translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Predict</source>
+        <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
+        <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error while getting time form
- server</source>
+        <source>You asked for a delay of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
+        <source> minutes, but only </source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NtpBase</name>
     <message>
-        <source>Network Time</source>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get time from network</source>
+        <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Time:</source>
+        <source>Running:
+ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>nan</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time Shift:</source>
+        <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Time:</source>
+        <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Esimated Shift:</source>
+        <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predicted Time:</source>
+        <source>Error while getting time from
+ server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean shift:</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set predicted time</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
     <message>
-        <source>Predict time</source>
+        <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>as</source>
+        <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP server to get the time from the network.</source>
+        <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wait for </source>
+        <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
     <message>
-        <source>minutes until</source>
+        <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insure a delay of</source>
+        <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
+        <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set time</source>
+        <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manual</source>
+        <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predict</source>
+        <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced settings</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Semana começa no(a)</translation>
+        <translation type="obsolete">Semana começa no(a)</translation>
     </message>
     <message>
         <source>Time Zone</source>
-        <translation>Zona Horária</translation>
+        <translation type="obsolete">Zona Horária</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 horas</translation>
+        <translation type="obsolete">12 horas</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Segunda</translation>
+        <translation type="obsolete">Segunda</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 horas</translation>
+        <translation type="obsolete">24 horas</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Domingo</translation>
+        <translation type="obsolete">Domingo</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Formato de data</translation>
+        <translation type="obsolete">Formato de data</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Formato de hora</translation>
+        <translation type="obsolete">Formato de hora</translation>
+    </message>
+</context>
+<context>
+    <name>SetTime</name>
+    <message>
+        <source>AM</source>
+        <translation type="obsolete">AM</translation>
     </message>
     <message>
-        <source>Applet format</source>
+        <source>PM</source>
+        <translation type="obsolete">PM</translation>
+    </message>
+    <message>
+        <source>Hour</source>
+        <translation type="obsolete">Hora</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="obsolete">Minuto</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>hh:mm</source>
+        <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D/M hh:mm</source>
+        <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>M/D hh:mm</source>
+        <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>System Time</source>
+        <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetTime</name>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation type="unfinished">Hora</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="unfinished">Minuto</translation>
+    </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="unfinished">PM</translation>
     </message>
     <message>
-        <source>Hour</source>
-        <translation>Hora</translation>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <source>Minute</source>
-        <translation>Minuto</translation>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/aqpkg.ts b/i18n/sl/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/sl/aqpkg.ts
+++ b/i18n/sl/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libliquid.ts b/i18n/sl/libliquid.ts
index 51b065c..cdb6ae1 100644
--- a/i18n/sl/libliquid.ts
+++ b/i18n/sl/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Stil Liquid</translation>
+        <translation type="unfinished">Stil Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Brez translucence</translation>
+        <translation type="unfinished">Brez translucence</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Črtasto, barva ozadja</translation>
+        <translation type="unfinished">Črtasto, barva ozadja</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Črtasto, barva gumba</translation>
+        <translation type="unfinished">Črtasto, barva gumba</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Transculentno črtasto, barva ozadja</translation>
+        <translation type="unfinished">Transculentno črtasto, barva ozadja</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Transculentno črtasto, barva gumba</translation>
+        <translation type="unfinished">Transculentno črtasto, barva gumba</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Nastavljena translucenca</translation>
+        <translation type="unfinished">Nastavljena translucenca</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Barva menujev</translation>
+        <translation type="unfinished">Barva menujev</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Barva besedila</translation>
+        <translation type="unfinished">Barva besedila</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Preliv</translation>
+        <translation type="unfinished">Preliv</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Uporabi senčeno besedilo v menujih</translation>
+        <translation type="unfinished">Uporabi senčeno besedilo v menujih</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Naj se orodni gumb pojavi ploščat</translation>
+        <translation type="unfinished">Naj se orodni gumb pojavi ploščat</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Črtast kontrast</translation>
+        <translation type="unfinished">Črtast kontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>High Performance Liquid stil od Mosfeta</translation>
+        <translation type="unfinished">High Performance Liquid stil od Mosfeta</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libopieobex.ts b/i18n/sl/libopieobex.ts
index 641a957..5e6e737 100644
--- a/i18n/sl/libopieobex.ts
+++ b/i18n/sl/libopieobex.ts
@@ -1,50 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ObexDlg</name>
     <message>
         <source>OBEX Sending</source>
-        <translation>OBEX pošilja</translation>
+        <translation type="obsolete">OBEX pošilja</translation>
     </message>
     <message>
         <source>Sending:</source>
-        <translation>Pošiljam:</translation>
+        <translation type="obsolete">Pošiljam:</translation>
     </message>
     <message>
         <source>filename</source>
-        <translation>Ime datoteke</translation>
+        <translation type="obsolete">Ime datoteke</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Prekliči</translation>
+        <translation type="obsolete">&amp;Prekliči</translation>
     </message>
 </context>
 <context>
     <name>ObexInc</name>
     <message>
         <source>OBEX Receiving</source>
-        <translation>Obex sprejema</translation>
+        <translation type="obsolete">Obex sprejema</translation>
     </message>
     <message>
         <source>TextLabel1</source>
-        <translation>TextLabel1</translation>
+        <translation type="obsolete">TextLabel1</translation>
     </message>
     <message>
         <source>Filename</source>
-        <translation>Ime datoteke</translation>
+        <translation type="obsolete">Ime datoteke</translation>
     </message>
     <message>
         <source>A file was beamed 
 to you.</source>
-        <translation>Datoteka je bila prežarčena
+        <translation type="obsolete">Datoteka je bila prežarčena
 k vam.</translation>
     </message>
     <message>
         <source>Insert</source>
-        <translation>Vstavi</translation>
+        <translation type="obsolete">Vstavi</translation>
     </message>
     <message>
         <source>Reject</source>
-        <translation>Zavrni</translation>
+        <translation type="obsolete">Zavrni</translation>
+    </message>
+</context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/opieftp.ts b/i18n/sl/opieftp.ts
index aecc924..c747251 100644
--- a/i18n/sl/opieftp.ts
+++ b/i18n/sl/opieftp.ts
@@ -1,240 +1,240 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Povezava</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Lokalen</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Oddaljen</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Poveži</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Prekini</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Prikaži skrite datoteke</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Prenos od sebe</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Ustvari imenik</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Prenesi k sebi</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Preklopi na lokalen</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Preklopi na oddaljen</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Preklopi na nastavitve</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Imenik</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uporabnik</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Geslo</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Oddaljeni strežnik</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Oddaljena pot</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Vrata</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Prosimo nastavite informacije o strežniku</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Ne uspem se povezati na</translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Ne uspem se prijaviti v</translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Ne uspem prenesti od sebe</translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Ne morem prenesti od sebe imenikov</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Ne uspem prenesti k sebi</translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Ne uspem dobiti seznama v imeniku</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Ne uspem zamenjati imenika</translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Ne uspem zamenjati imenika</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Ne uspem dobiti delovnega imenika</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zamenjaj imenik</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati</translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>?
 Mora biti prazen</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Ne uspem ustvariti imenika</translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Ne uspem odstraniti imenika</translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Ne uspem izbrisati datoteke</translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Ne uspem preimenovati datoteke</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Ne morem preimenovati</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ta imenik ne obstaja</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>O</translation>
+        <translation type="obsolete">O</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Preglej</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/oxygen.ts b/i18n/sl/oxygen.ts
index eaf68a3..c0003ef 100644
--- a/i18n/sl/oxygen.ts
+++ b/i18n/sl/oxygen.ts
@@ -1,561 +1,561 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Americium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Californium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index 4bf0292..ca0ffaf 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -1,244 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></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"></translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sinhroniziram</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Kontakti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/security.ts b/i18n/sl/security.ts
index 8cd4e74..e817117 100644
--- a/i18n/sl/security.ts
+++ b/i18n/sl/security.ts
@@ -1,102 +1,106 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Nastavi kodo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpišite kodo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koda ni pravilna</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Vpisana koda ni pravilna.
 Dostop zavrnjen</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Varnostne nastavitve</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Zbriši kodo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Potrebna koda pri vklopu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sinhroniziraj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sperjmi sinhronizacijo iz mreže:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>brez</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Koda prinaša minimalno zaščito za varovanje vaše naprave.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (privzeto)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/systemtime.ts b/i18n/sl/systemtime.ts
index 44bbef8..8b43d60 100644
--- a/i18n/sl/systemtime.ts
+++ b/i18n/sl/systemtime.ts
@@ -1,271 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Ntp</name>
+    <name>FormatTabWidget</name>
     <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
+        <source>Time format</source>
+        <translation type="unfinished">Oblika časa</translation>
     </message>
     <message>
-        <source>Running:</source>
-        <translation type="unfinished"></translation>
+        <source>hh:mm</source>
+        <translation type="unfinished">uu:mm</translation>
     </message>
     <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">D/M uu:mm</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/D hh:mm</translation>
     </message>
     <message>
-        <source>last [h]</source>
-        <translation type="unfinished"></translation>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 ur</translation>
     </message>
     <message>
-        <source>offset [s]</source>
-        <translation type="unfinished"></translation>
+        <source>24 hour</source>
+        <translation type="unfinished">24 ur</translation>
     </message>
     <message>
-        <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <source>12 hour</source>
+        <translation type="unfinished">12 ur</translation>
     </message>
     <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <source>Date format</source>
+        <translation type="unfinished">Oblika datuma</translation>
     </message>
     <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Teden se začne na</translation>
     </message>
     <message>
-        <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
+        <source>Sunday</source>
+        <translation type="unfinished">Nedeljo</translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <source>Monday</source>
+        <translation type="unfinished">Ponedeljek</translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Predict</source>
+        <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
+        <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error while getting time form
- server</source>
+        <source>You asked for a delay of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
+        <source> minutes, but only </source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NtpBase</name>
     <message>
-        <source>Network Time</source>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get time from network</source>
+        <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Time:</source>
+        <source>Running:
+ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>nan</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time Shift:</source>
+        <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Time:</source>
+        <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Esimated Shift:</source>
+        <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predicted Time:</source>
+        <source>Error while getting time from
+ server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean shift:</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set predicted time</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
     <message>
-        <source>Predict time</source>
+        <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>as</source>
+        <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP server to get the time from the network.</source>
+        <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wait for </source>
+        <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
     <message>
-        <source>minutes until</source>
+        <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insure a delay of</source>
+        <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
+        <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set time</source>
+        <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
+        <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manual</source>
+        <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predict</source>
+        <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
+        <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced settings</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation>Časovni pas</translation>
+        <translation type="obsolete">Časovni pas</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Datum</translation>
+        <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Oblika časa</translation>
+        <translation type="obsolete">Oblika časa</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 ur</translation>
+        <translation type="obsolete">24 ur</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 ur</translation>
+        <translation type="obsolete">12 ur</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Teden se začne na</translation>
+        <translation type="obsolete">Teden se začne na</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Nedeljo</translation>
+        <translation type="obsolete">Nedeljo</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Ponedeljek</translation>
+        <translation type="obsolete">Ponedeljek</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Oblika datuma</translation>
+        <translation type="obsolete">Oblika datuma</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Oblika programčka</translation>
+        <translation type="obsolete">Oblika programčka</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>uu:mm</translation>
+        <translation type="obsolete">uu:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>D/M uu:mm</translation>
+        <translation type="obsolete">D/M uu:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/D hh:mm</translation>
+        <translation type="obsolete">M/D hh:mm</translation>
+    </message>
+</context>
+<context>
+    <name>SetTime</name>
+    <message>
+        <source>Hour</source>
+        <translation type="obsolete">Ura</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="obsolete">Minute</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="obsolete">AM</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="obsolete">PM</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>System Time</source>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetTime</name>
+    <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation>Ura</translation>
+        <translation type="unfinished">Ura</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Minute</translation>
+        <translation type="unfinished">Minute</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="unfinished">PM</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Datum</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/kpacman.ts b/i18n/xx/kpacman.ts
index 962300e..feb59f9 100644
--- a/i18n/xx/kpacman.ts
+++ b/i18n/xx/kpacman.ts
@@ -1,232 +1,232 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configuration Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>                          </source>
-        <translation>FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libliquid.ts b/i18n/xx/libliquid.ts
index 0c2cbc7..4df7a86 100644
--- a/i18n/xx/libliquid.ts
+++ b/i18n/xx/libliquid.ts
@@ -1,71 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopieobex.ts b/i18n/xx/libopieobex.ts
index e130858..8f354b5 100644
--- a/i18n/xx/libopieobex.ts
+++ b/i18n/xx/libopieobex.ts
@@ -1,82 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
-</context>
-<context>
-    <name>ObexInc</name>
-</context>
-<context>
     <name>OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>FOO</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>FOO</translation>
     </message>
 </context>
 <context>
     <name>SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/systemtime.ts b/i18n/xx/systemtime.ts
index 696d834..5f0f3bd 100644
--- a/i18n/xx/systemtime.ts
+++ b/i18n/xx/systemtime.ts
@@ -1,262 +1,250 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You asked for a delay of </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes, but only </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Continue?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
-    <name>Ntp</name>
-</context>
-<context>
-    <name>NtpBase</name>
-</context>
-<context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-</context>
-<context>
-    <name>SetTime</name>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/aqpkg.ts b/i18n/zh_CN/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/zh_CN/aqpkg.ts
+++ b/i18n/zh_CN/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/aqpkg.ts b/i18n/zh_TW/aqpkg.ts
index cd7b997..348cc10 100644
--- a/i18n/zh_TW/aqpkg.ts
+++ b/i18n/zh_TW/aqpkg.ts
@@ -1,531 +1,546 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</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>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/kpacman.ts b/i18n/zh_TW/kpacman.ts
index c90f372..6d7d7e1 100644
--- a/i18n/zh_TW/kpacman.ts
+++ b/i18n/zh_TW/kpacman.ts
@@ -1,250 +1,250 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>預設值</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>改變方向鍵</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>未定義的按鍵</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>新遊戲(&amp;N)</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>暫停(&amp;P)</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>名人堂(&amp;H)</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>離開(&amp;Q)</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>隱藏滑鼠游標(&amp;H)</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>選擇圖形主題(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>在背景時暫停(&amp;P)</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>在前景時繼續(&amp;C)</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>改變按鍵(&amp;K)...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 KDE 桌面環境的小精靈遊戲
 
 這個遊戲的基礎是 Michel Filippi (mfilippi@sade.rhein-main.de)
 的 ksnake 的原始碼. 
 它的設計受到小精靈(c) 1980 MIDWAY MFG.CO的強烈影響.
 
 我想要感謝我的女友 Elke Krueers
 過去 10 年的友情.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>說明(&amp;H)</translation>
     </message>
     <message>
         <source>Configuration Error</source>
         <translation>組態錯誤</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
         <translation>沒有定義主題,
 或尚未選擇主題.</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>無法建立點陣字型.
 
 檔案 &apos;@FONTNAME@&apos; 不存在,
 或者它是未知的格式.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>遊戲結束</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>一號玩家</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>預備!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>暫停</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>角色</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>暱稱</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>移植到 QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>按下游標以便開始</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP </translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation> 最高分數 </translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP </translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>     恭喜      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>    你已經達到    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>  前 10 名的分數.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK   SCORE  NAME   DATE</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>暫停</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source>                          </source>
-        <translation>                          </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>無法建立點陣圖.
 
 檔案 &apos;@PIXMAPNAME@&apos; 不存在,
 或者它是未知的格式.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>初始化錯誤</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/language.ts b/i18n/zh_TW/language.ts
index a074308..6837223 100644
--- a/i18n/zh_TW/language.ts
+++ b/i18n/zh_TW/language.ts
@@ -1,24 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>英文</translation>
     </message>
     <message>
         <source>default</source>
         <translation>預設值</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
-        <translation>語言</translation>
+        <translation type="obsolete">語言</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>選擇語言</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libliquid.ts b/i18n/zh_TW/libliquid.ts
index c55907e..9af369c 100644
--- a/i18n/zh_TW/libliquid.ts
+++ b/i18n/zh_TW/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">透明</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>透明風格</translation>
+        <translation type="unfinished">透明風格</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>不使用半透明</translation>
+        <translation type="unfinished">不使用半透明</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>網底, 背景顏色</translation>
+        <translation type="unfinished">網底, 背景顏色</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>網底, 按鈕顏色</translation>
+        <translation type="unfinished">網底, 按鈕顏色</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>透明網底, 背景顏色</translation>
+        <translation type="unfinished">透明網底, 背景顏色</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>透明網底, 按鈕顏色</translation>
+        <translation type="unfinished">透明網底, 按鈕顏色</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>自訂半透明</translation>
+        <translation type="unfinished">自訂半透明</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>選單顏色</translation>
+        <translation type="unfinished">選單顏色</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>文字顏色</translation>
+        <translation type="unfinished">文字顏色</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>不透明度</translation>
+        <translation type="unfinished">不透明度</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>使用有陰影的選單文字</translation>
+        <translation type="unfinished">使用有陰影的選單文字</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>讓工具列按鈕變得扁平</translation>
+        <translation type="unfinished">讓工具列按鈕變得扁平</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>網底對比</translation>
+        <translation type="unfinished">網底對比</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>透明</translation>
+        <translation type="unfinished">透明</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Mosfet 提供的高品質透明風格</translation>
+        <translation type="unfinished">Mosfet 提供的高品質透明風格</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/liblogoutapplet.ts b/i18n/zh_TW/liblogoutapplet.ts
index 01d33f3..92b6e00 100644
--- a/i18n/zh_TW/liblogoutapplet.ts
+++ b/i18n/zh_TW/liblogoutapplet.ts
@@ -1,18 +1,18 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LogoutApplet</name>
     <message>
         <source>Logout shortcut</source>
-        <translation >快速登出</translation>
+        <translation>快速登出</translation>
     </message>
     <message>
         <source>Logout</source>
-        <translation >登出</translation>
+        <translation>登出</translation>
     </message>
     <message>
         <source>Do you really want to
 end this session ?</source>
-        <translation >確定登出?</translation>
+        <translation>確定登出?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopieobex.ts b/i18n/zh_TW/libopieobex.ts
index 7ef6816..3c85614 100644
--- a/i18n/zh_TW/libopieobex.ts
+++ b/i18n/zh_TW/libopieobex.ts
@@ -1,50 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ObexDlg</name>
     <message>
         <source>OBEX Sending</source>
-        <translation>OBEX 傳送中</translation>
+        <translation type="obsolete">OBEX 傳送中</translation>
     </message>
     <message>
         <source>Sending:</source>
-        <translation>正在傳送:</translation>
+        <translation type="obsolete">正在傳送:</translation>
     </message>
     <message>
         <source>filename</source>
-        <translation>檔案名稱</translation>
+        <translation type="obsolete">檔案名稱</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>取消(&amp;C)</translation>
+        <translation type="obsolete">取消(&amp;C)</translation>
     </message>
 </context>
 <context>
     <name>ObexInc</name>
     <message>
         <source>OBEX Receiving</source>
-        <translation>OBEX 接收</translation>
+        <translation type="obsolete">OBEX 接收</translation>
     </message>
     <message>
         <source>TextLabel1</source>
-        <translation>文字標籤1</translation>
+        <translation type="obsolete">文字標籤1</translation>
     </message>
     <message>
         <source>Filename</source>
-        <translation>檔案名稱</translation>
+        <translation type="obsolete">檔案名稱</translation>
     </message>
     <message>
         <source>A file was beamed 
 to you.</source>
-        <translation>有個檔案傳送
+        <translation type="obsolete">有個檔案傳送
 給您了.</translation>
     </message>
     <message>
         <source>Insert</source>
-        <translation>插入</translation>
+        <translation type="obsolete">插入</translation>
     </message>
     <message>
         <source>Reject</source>
-        <translation>拒絕</translation>
+        <translation type="obsolete">拒絕</translation>
+    </message>
+</context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqkjumpx.ts b/i18n/zh_TW/libqkjumpx.ts
index c2d8db3..2f0bdbc 100644
--- a/i18n/zh_TW/libqkjumpx.ts
+++ b/i18n/zh_TW/libqkjumpx.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>KJumpX</source>
-        <translation >KJumpX</translation>
+        <translation>KJumpX</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libscreenshotapplet.ts b/i18n/zh_TW/libscreenshotapplet.ts
index 84f00d8..26ba418 100644
--- a/i18n/zh_TW/libscreenshotapplet.ts
+++ b/i18n/zh_TW/libscreenshotapplet.ts
@@ -1,17 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Snapshot</source>
-        <translation>Snapshot</translation>
+        <translation type="obsolete">Snapshot</translation>
     </message>
     <message>
         <source>scap</source>
-        <translation>scap</translation>
+        <translation type="obsolete">scap</translation>
     </message>
     <message>
         <source>Name of screenshot </source>
         <translation>檔案名稱</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>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screenshot was uploaded to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection to %1 failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/mediummount.ts b/i18n/zh_TW/mediummount.ts
index 53fbf9b..551f00f 100644
--- a/i18n/zh_TW/mediummount.ts
+++ b/i18n/zh_TW/mediummount.ts
@@ -1,87 +1,99 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation>全域</translation>
     </message>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
         <translation>啟用媒體檢查</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>使用全域設定</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>哪種媒體檔案</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>音訊</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>影像</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>視訊</translation>
     </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation>哪種媒體檔案</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>音訊</translation>
     </message>
     <message>
         <source>All</source>
         <translation>所有</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>影像</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>視訊</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>限制搜尋為:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>永遠檢查這類媒體</translation>
     </message>
     <message>
         <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
-        <translation>設定這個媒體. 這些變更會在應用程式關閉之後產生效用. 要更新文件索引標籤, 您需要移除並重新插入這個媒體.</translation>
+        <translation type="obsolete">設定這個媒體. 這些變更會在應用程式關閉之後產生效用. 要更新文件索引標籤, 您需要移除並重新插入這個媒體.</translation>
+    </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/minesweep.ts b/i18n/zh_TW/minesweep.ts
index e031976..8f00160 100644
--- a/i18n/zh_TW/minesweep.ts
+++ b/i18n/zh_TW/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
-        <translation >你贏了!</translation>
+        <translation>你贏了!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>你爆了!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
         <translation>採地雷</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>初學</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation >進階</translation>
+        <translation>進階</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>專家</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opieftp.ts b/i18n/zh_TW/opieftp.ts
index 70f7b42..ee18fe0 100644
--- a/i18n/zh_TW/opieftp.ts
+++ b/i18n/zh_TW/opieftp.ts
@@ -1,253 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>連線</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>本地</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>遠端</translation>
     </message>
     <message>
         <source>View</source>
         <translation>檢視</translation>
     </message>
     <message>
         <source>New</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>連線</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>斷線</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>顯示隱藏檔案</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>上傳</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>建立目錄</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>更名</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>切換到本地</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>切換到遠端</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>切換到設定</translation>
     </message>
     <message>
         <source>File</source>
         <translation>名稱</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>修改日期</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>目錄</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>帳號</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>遠端主機位置</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>遠端主機目錄</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>連接埠</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>設定</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>請設定主機資訊</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>附註</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>無法建立連線
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>無法登入
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>無法上傳
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>無法上傳目錄</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>無法下載
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>無法列出此目錄檔案清單
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>無法切換目錄
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>無法到上層目錄
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>無法進入工作目錄
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>切換目錄</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>確定刪除
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 這個目錄必須是空的</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>竊定</translation>
     </message>
     <message>
         <source>No</source>
         <translation>取消</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>無法新建目錄
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>無法刪除目錄
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>無法刪除檔案
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>無法更名檔案
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>無法更名</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>目錄並不存在</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>關於</translation>
+        <translation type="obsolete">關於</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>重新整理</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>新主機名稱</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>名稱已經存在</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index 2083bf8..b0a9a5b 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -1,570 +1,1006 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>計算</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
         <source>Form1</source>
-        <translation>表單1</translation>
+        <translation type="obsolete">表單1</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>分子量</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>化學式</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>分子量 (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>元素成分 (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
-        <translation>重量:</translation>
+        <translation type="obsolete">重量:</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>區塊</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>群</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>電負度</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>原子半徑</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>游離能</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>密度</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>沸點</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>熔點</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>資料</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>計算結果</translation>
     </message>
+    <message>
+        <source>Hydrogen</source>
+        <translation type="unfinished">氫</translation>
+    </message>
+    <message>
+        <source>Helium</source>
+        <translation type="unfinished">氦</translation>
+    </message>
+    <message>
+        <source>Lithium</source>
+        <translation type="unfinished">鋰</translation>
+    </message>
+    <message>
+        <source>Beryllium</source>
+        <translation type="unfinished">鈹</translation>
+    </message>
+    <message>
+        <source>Boron</source>
+        <translation type="unfinished">硼</translation>
+    </message>
+    <message>
+        <source>Carbon</source>
+        <translation type="unfinished">碳</translation>
+    </message>
+    <message>
+        <source>Nitrogen</source>
+        <translation type="unfinished">氮</translation>
+    </message>
+    <message>
+        <source>Fluorine</source>
+        <translation type="unfinished">氟</translation>
+    </message>
+    <message>
+        <source>Neon</source>
+        <translation type="unfinished">氖</translation>
+    </message>
+    <message>
+        <source>Sodium</source>
+        <translation type="unfinished">鈉</translation>
+    </message>
+    <message>
+        <source>Magnesium</source>
+        <translation type="unfinished">鎂</translation>
+    </message>
+    <message>
+        <source>Aluminum</source>
+        <translation type="unfinished">鋁</translation>
+    </message>
+    <message>
+        <source>Silicon</source>
+        <translation type="unfinished">矽</translation>
+    </message>
+    <message>
+        <source>Phosphorus</source>
+        <translation type="unfinished">磷</translation>
+    </message>
+    <message>
+        <source>Sulfur</source>
+        <translation type="unfinished">硫</translation>
+    </message>
+    <message>
+        <source>Chlorine</source>
+        <translation type="unfinished">氯</translation>
+    </message>
+    <message>
+        <source>Argon</source>
+        <translation type="unfinished">氬</translation>
+    </message>
+    <message>
+        <source>Potassium</source>
+        <translation type="unfinished">鉀</translation>
+    </message>
+    <message>
+        <source>Calcium</source>
+        <translation type="unfinished">鈣</translation>
+    </message>
+    <message>
+        <source>Scandium</source>
+        <translation type="unfinished">鈧</translation>
+    </message>
+    <message>
+        <source>Titanium</source>
+        <translation type="unfinished">鈦</translation>
+    </message>
+    <message>
+        <source>Vanadium</source>
+        <translation type="unfinished">釩</translation>
+    </message>
+    <message>
+        <source>Chromium</source>
+        <translation type="unfinished">鉻</translation>
+    </message>
+    <message>
+        <source>Manganese</source>
+        <translation type="unfinished">錳</translation>
+    </message>
+    <message>
+        <source>Iron</source>
+        <translation type="unfinished">鐵</translation>
+    </message>
+    <message>
+        <source>Cobalt</source>
+        <translation type="unfinished">鈷</translation>
+    </message>
+    <message>
+        <source>Nickel</source>
+        <translation type="unfinished">鎳</translation>
+    </message>
+    <message>
+        <source>Copper</source>
+        <translation type="unfinished">銅</translation>
+    </message>
+    <message>
+        <source>Zinc</source>
+        <translation type="unfinished">鋅</translation>
+    </message>
+    <message>
+        <source>Gallium</source>
+        <translation type="unfinished">鎵</translation>
+    </message>
+    <message>
+        <source>Germanium</source>
+        <translation type="unfinished">鍺</translation>
+    </message>
+    <message>
+        <source>Arsenic</source>
+        <translation type="unfinished">砷</translation>
+    </message>
+    <message>
+        <source>Selenium</source>
+        <translation type="unfinished">硒</translation>
+    </message>
+    <message>
+        <source>Bromine</source>
+        <translation type="unfinished">溴</translation>
+    </message>
+    <message>
+        <source>Krypton</source>
+        <translation type="unfinished">氪</translation>
+    </message>
+    <message>
+        <source>Rubidium</source>
+        <translation type="unfinished">銣</translation>
+    </message>
+    <message>
+        <source>Strontium</source>
+        <translation type="unfinished">鍶</translation>
+    </message>
+    <message>
+        <source>Yttrium</source>
+        <translation type="unfinished">釔</translation>
+    </message>
+    <message>
+        <source>Zirconium</source>
+        <translation type="unfinished">鋯</translation>
+    </message>
+    <message>
+        <source>Niobium</source>
+        <translation type="unfinished">鈮</translation>
+    </message>
+    <message>
+        <source>Molybdenum</source>
+        <translation type="unfinished">鉬</translation>
+    </message>
+    <message>
+        <source>Technetium</source>
+        <translation type="unfinished">鎝</translation>
+    </message>
+    <message>
+        <source>Ruthenium</source>
+        <translation type="unfinished">釕</translation>
+    </message>
+    <message>
+        <source>Rhodium</source>
+        <translation type="unfinished">銠</translation>
+    </message>
+    <message>
+        <source>Palladium</source>
+        <translation type="unfinished">鈀</translation>
+    </message>
+    <message>
+        <source>Silver</source>
+        <translation type="unfinished">銀</translation>
+    </message>
+    <message>
+        <source>Cadmium</source>
+        <translation type="unfinished">鎘</translation>
+    </message>
+    <message>
+        <source>Indium</source>
+        <translation type="unfinished">銦</translation>
+    </message>
+    <message>
+        <source>Tin</source>
+        <translation type="unfinished">錫</translation>
+    </message>
+    <message>
+        <source>Antimony</source>
+        <translation type="unfinished">銻</translation>
+    </message>
+    <message>
+        <source>Tellurium</source>
+        <translation type="unfinished">碲</translation>
+    </message>
+    <message>
+        <source>Iodine</source>
+        <translation type="unfinished">碘</translation>
+    </message>
+    <message>
+        <source>Xenon</source>
+        <translation type="unfinished">氙</translation>
+    </message>
+    <message>
+        <source>Cesium</source>
+        <translation type="unfinished">銫</translation>
+    </message>
+    <message>
+        <source>Barium</source>
+        <translation type="unfinished">鋇</translation>
+    </message>
+    <message>
+        <source>Lanthanum</source>
+        <translation type="unfinished">鑭</translation>
+    </message>
+    <message>
+        <source>Cerium</source>
+        <translation type="unfinished">鈰</translation>
+    </message>
+    <message>
+        <source>Praseodymium</source>
+        <translation type="unfinished">鐠</translation>
+    </message>
+    <message>
+        <source>Neodymium</source>
+        <translation type="unfinished">釹</translation>
+    </message>
+    <message>
+        <source>Promethium</source>
+        <translation type="unfinished">鉅</translation>
+    </message>
+    <message>
+        <source>Samarium</source>
+        <translation type="unfinished">釤</translation>
+    </message>
+    <message>
+        <source>Europium</source>
+        <translation type="unfinished">銪</translation>
+    </message>
+    <message>
+        <source>Gadolinium</source>
+        <translation type="unfinished">釓</translation>
+    </message>
+    <message>
+        <source>Terbium</source>
+        <translation type="unfinished">鋱</translation>
+    </message>
+    <message>
+        <source>Dysprosium</source>
+        <translation type="unfinished">鏑</translation>
+    </message>
+    <message>
+        <source>Holmium</source>
+        <translation type="unfinished">鈥</translation>
+    </message>
+    <message>
+        <source>Erbium</source>
+        <translation type="unfinished">鉺</translation>
+    </message>
+    <message>
+        <source>Thulium</source>
+        <translation type="unfinished">銩</translation>
+    </message>
+    <message>
+        <source>Ytterbium</source>
+        <translation type="unfinished">鐿</translation>
+    </message>
+    <message>
+        <source>Lutetium</source>
+        <translation type="unfinished">鎦</translation>
+    </message>
+    <message>
+        <source>Hafnium</source>
+        <translation type="unfinished">鉿</translation>
+    </message>
+    <message>
+        <source>Tantalum</source>
+        <translation type="unfinished">鉭</translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished">鎢</translation>
+    </message>
+    <message>
+        <source>Rhenium</source>
+        <translation type="unfinished">錸</translation>
+    </message>
+    <message>
+        <source>Osmium</source>
+        <translation type="unfinished">鋨</translation>
+    </message>
+    <message>
+        <source>Iridium</source>
+        <translation type="unfinished">銥</translation>
+    </message>
+    <message>
+        <source>Platinum</source>
+        <translation type="unfinished">鉑</translation>
+    </message>
+    <message>
+        <source>Gold</source>
+        <translation type="unfinished">金</translation>
+    </message>
+    <message>
+        <source>Mercury</source>
+        <translation type="unfinished">汞</translation>
+    </message>
+    <message>
+        <source>Thallium</source>
+        <translation type="unfinished">鉈</translation>
+    </message>
+    <message>
+        <source>Lead</source>
+        <translation type="unfinished">鉛</translation>
+    </message>
+    <message>
+        <source>Bismuth</source>
+        <translation type="unfinished">鉍</translation>
+    </message>
+    <message>
+        <source>Polonium</source>
+        <translation type="unfinished">釙</translation>
+    </message>
+    <message>
+        <source>Astatine</source>
+        <translation type="unfinished">厄</translation>
+    </message>
+    <message>
+        <source>Radon</source>
+        <translation type="unfinished">氡</translation>
+    </message>
+    <message>
+        <source>Francium</source>
+        <translation type="unfinished">鈁</translation>
+    </message>
+    <message>
+        <source>Radium</source>
+        <translation type="unfinished">鐳</translation>
+    </message>
+    <message>
+        <source>Actinium</source>
+        <translation type="unfinished">錒</translation>
+    </message>
+    <message>
+        <source>Thorium</source>
+        <translation type="unfinished">釷</translation>
+    </message>
+    <message>
+        <source>Protactinium</source>
+        <translation type="unfinished">鏷</translation>
+    </message>
+    <message>
+        <source>Uranium</source>
+        <translation type="unfinished">鈾</translation>
+    </message>
+    <message>
+        <source>Neptunium</source>
+        <translation type="unfinished">錼</translation>
+    </message>
+    <message>
+        <source>Plutonium</source>
+        <translation type="unfinished">鈽</translation>
+    </message>
+    <message>
+        <source>Americium</source>
+        <translation type="unfinished">鋂</translation>
+    </message>
+    <message>
+        <source>Curium</source>
+        <translation type="unfinished">鋦</translation>
+    </message>
+    <message>
+        <source>Berkelium</source>
+        <translation type="unfinished">(金北)</translation>
+    </message>
+    <message>
+        <source>Californium</source>
+        <translation type="unfinished">鉲</translation>
+    </message>
+    <message>
+        <source>Einsteinium</source>
+        <translation type="unfinished">鑀</translation>
+    </message>
+    <message>
+        <source>Fermium</source>
+        <translation type="unfinished">鐨</translation>
+    </message>
+    <message>
+        <source>Mendelevium</source>
+        <translation type="unfinished">鍆</translation>
+    </message>
+    <message>
+        <source>Nobelium</source>
+        <translation type="unfinished">(金若)</translation>
+    </message>
+    <message>
+        <source>Lawrencium</source>
+        <translation type="unfinished">鐒</translation>
+    </message>
+    <message>
+        <source>Rutherfordium</source>
+        <translation type="unfinished">鑪</translation>
+    </message>
+    <message>
+        <source>Dubnium</source>
+        <translation type="unfinished">(金杜)</translation>
+    </message>
+    <message>
+        <source>Seaborgium</source>
+        <translation type="unfinished">(金喜)</translation>
+    </message>
+    <message>
+        <source>Bohrium</source>
+        <translation type="unfinished">(金波)</translation>
+    </message>
+    <message>
+        <source>Hassium</source>
+        <translation type="unfinished">(金黑)</translation>
+    </message>
+    <message>
+        <source>Meitnerium</source>
+        <translation type="unfinished">(金麥)</translation>
+    </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>週期系統</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>錯誤: 
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Chemical Data</translation>
     </message>
     <message>
         <source>Hydrogen</source>
-        <translation>氫</translation>
+        <translation type="obsolete">氫</translation>
     </message>
     <message>
         <source>Helium</source>
-        <translation>氦</translation>
+        <translation type="obsolete">氦</translation>
     </message>
     <message>
         <source>Lithium</source>
-        <translation>鋰</translation>
+        <translation type="obsolete">鋰</translation>
     </message>
     <message>
         <source>Beryllium</source>
-        <translation>鈹</translation>
+        <translation type="obsolete">鈹</translation>
     </message>
     <message>
         <source>Boron</source>
-        <translation>硼</translation>
+        <translation type="obsolete">硼</translation>
     </message>
     <message>
         <source>Carbon</source>
-        <translation>碳</translation>
+        <translation type="obsolete">碳</translation>
     </message>
     <message>
         <source>Nitrogen</source>
-        <translation>氮</translation>
+        <translation type="obsolete">氮</translation>
     </message>
     <message>
         <source>Oxygen</source>
-        <translation>氧</translation>
+        <translation type="obsolete">氧</translation>
     </message>
     <message>
         <source>Fluorine</source>
-        <translation>氟</translation>
+        <translation type="obsolete">氟</translation>
     </message>
     <message>
         <source>Neon</source>
-        <translation>氖</translation>
+        <translation type="obsolete">氖</translation>
     </message>
     <message>
         <source>Sodium</source>
-        <translation>鈉</translation>
+        <translation type="obsolete">鈉</translation>
     </message>
     <message>
         <source>Magnesium</source>
-        <translation>鎂</translation>
+        <translation type="obsolete">鎂</translation>
     </message>
     <message>
         <source>Aluminum</source>
-        <translation>鋁</translation>
+        <translation type="obsolete">鋁</translation>
     </message>
     <message>
         <source>Silicon</source>
-        <translation>矽</translation>
+        <translation type="obsolete">矽</translation>
     </message>
     <message>
         <source>Phosphorus</source>
-        <translation>磷</translation>
+        <translation type="obsolete">磷</translation>
     </message>
     <message>
         <source>Sulfur</source>
-        <translation>硫</translation>
+        <translation type="obsolete">硫</translation>
     </message>
     <message>
         <source>Chlorine</source>
-        <translation>氯</translation>
+        <translation type="obsolete">氯</translation>
     </message>
     <message>
         <source>Argon</source>
-        <translation>氬</translation>
+        <translation type="obsolete">氬</translation>
     </message>
     <message>
         <source>Potassium</source>
-        <translation>鉀</translation>
+        <translation type="obsolete">鉀</translation>
     </message>
     <message>
         <source>Calcium</source>
-        <translation>鈣</translation>
+        <translation type="obsolete">鈣</translation>
     </message>
     <message>
         <source>Scandium</source>
-        <translation>鈧</translation>
+        <translation type="obsolete">鈧</translation>
     </message>
     <message>
         <source>Titanium</source>
-        <translation>鈦</translation>
+        <translation type="obsolete">鈦</translation>
     </message>
     <message>
         <source>Vanadium</source>
-        <translation>釩</translation>
+        <translation type="obsolete">釩</translation>
     </message>
     <message>
         <source>Chromium</source>
-        <translation>鉻</translation>
+        <translation type="obsolete">鉻</translation>
     </message>
     <message>
         <source>Manganese</source>
-        <translation>錳</translation>
+        <translation type="obsolete">錳</translation>
     </message>
     <message>
         <source>Iron</source>
-        <translation>鐵</translation>
+        <translation type="obsolete">鐵</translation>
     </message>
     <message>
         <source>Cobalt</source>
-        <translation>鈷</translation>
+        <translation type="obsolete">鈷</translation>
     </message>
     <message>
         <source>Nickel</source>
-        <translation>鎳</translation>
+        <translation type="obsolete">鎳</translation>
     </message>
     <message>
         <source>Copper</source>
-        <translation>銅</translation>
+        <translation type="obsolete">銅</translation>
     </message>
     <message>
         <source>Zinc</source>
-        <translation>鋅</translation>
+        <translation type="obsolete">鋅</translation>
     </message>
     <message>
         <source>Gallium</source>
-        <translation>鎵</translation>
+        <translation type="obsolete">鎵</translation>
     </message>
     <message>
         <source>Germanium</source>
-        <translation>鍺</translation>
+        <translation type="obsolete">鍺</translation>
     </message>
     <message>
         <source>Arsenic</source>
-        <translation>砷</translation>
+        <translation type="obsolete">砷</translation>
     </message>
     <message>
         <source>Selenium</source>
-        <translation>硒</translation>
+        <translation type="obsolete">硒</translation>
     </message>
     <message>
         <source>Bromine</source>
-        <translation>溴</translation>
+        <translation type="obsolete">溴</translation>
     </message>
     <message>
         <source>Krypton</source>
-        <translation>氪</translation>
+        <translation type="obsolete">氪</translation>
     </message>
     <message>
         <source>Rubidium</source>
-        <translation>銣</translation>
+        <translation type="obsolete">銣</translation>
     </message>
     <message>
         <source>Strontium</source>
-        <translation>鍶</translation>
+        <translation type="obsolete">鍶</translation>
     </message>
     <message>
         <source>Yttrium</source>
-        <translation>釔</translation>
+        <translation type="obsolete">釔</translation>
     </message>
     <message>
         <source>Zirconium</source>
-        <translation>鋯</translation>
+        <translation type="obsolete">鋯</translation>
     </message>
     <message>
         <source>Niobium</source>
-        <translation>鈮</translation>
+        <translation type="obsolete">鈮</translation>
     </message>
     <message>
         <source>Molybdenum</source>
-        <translation>鉬</translation>
+        <translation type="obsolete">鉬</translation>
     </message>
     <message>
         <source>Technetium</source>
-        <translation>鎝</translation>
+        <translation type="obsolete">鎝</translation>
     </message>
     <message>
         <source>Ruthenium</source>
-        <translation>釕</translation>
+        <translation type="obsolete">釕</translation>
     </message>
     <message>
         <source>Rhodium</source>
-        <translation>銠</translation>
+        <translation type="obsolete">銠</translation>
     </message>
     <message>
         <source>Palladium</source>
-        <translation>鈀</translation>
+        <translation type="obsolete">鈀</translation>
     </message>
     <message>
         <source>Silver</source>
-        <translation>銀</translation>
+        <translation type="obsolete">銀</translation>
     </message>
     <message>
         <source>Cadmium</source>
-        <translation>鎘</translation>
+        <translation type="obsolete">鎘</translation>
     </message>
     <message>
         <source>Indium</source>
-        <translation>銦</translation>
+        <translation type="obsolete">銦</translation>
     </message>
     <message>
         <source>Tin</source>
-        <translation>錫</translation>
+        <translation type="obsolete">錫</translation>
     </message>
     <message>
         <source>Antimony</source>
-        <translation>銻</translation>
+        <translation type="obsolete">銻</translation>
     </message>
     <message>
         <source>Tellurium</source>
-        <translation>碲</translation>
+        <translation type="obsolete">碲</translation>
     </message>
     <message>
         <source>Iodine</source>
-        <translation>碘</translation>
+        <translation type="obsolete">碘</translation>
     </message>
     <message>
         <source>Xenon</source>
-        <translation>氙</translation>
+        <translation type="obsolete">氙</translation>
     </message>
     <message>
         <source>Cesium</source>
-        <translation>銫</translation>
+        <translation type="obsolete">銫</translation>
     </message>
     <message>
         <source>Barium</source>
-        <translation>鋇</translation>
+        <translation type="obsolete">鋇</translation>
     </message>
     <message>
         <source>Lanthanum</source>
-        <translation>鑭</translation>
+        <translation type="obsolete">鑭</translation>
     </message>
     <message>
         <source>Cerium</source>
-        <translation>鈰</translation>
+        <translation type="obsolete">鈰</translation>
     </message>
     <message>
         <source>Praseodymium</source>
-        <translation>鐠</translation>
+        <translation type="obsolete">鐠</translation>
     </message>
     <message>
         <source>Neodymium</source>
-        <translation>釹</translation>
+        <translation type="obsolete">釹</translation>
     </message>
     <message>
         <source>Promethium</source>
-        <translation>鉅</translation>
+        <translation type="obsolete">鉅</translation>
     </message>
     <message>
         <source>Samarium</source>
-        <translation>釤</translation>
+        <translation type="obsolete">釤</translation>
     </message>
     <message>
         <source>Europium</source>
-        <translation>銪</translation>
+        <translation type="obsolete">銪</translation>
     </message>
     <message>
         <source>Gadolinium</source>
-        <translation>釓</translation>
+        <translation type="obsolete">釓</translation>
     </message>
     <message>
         <source>Terbium</source>
-        <translation>鋱</translation>
+        <translation type="obsolete">鋱</translation>
     </message>
     <message>
         <source>Dysprosium</source>
-        <translation>鏑</translation>
+        <translation type="obsolete">鏑</translation>
     </message>
     <message>
         <source>Holmium</source>
-        <translation>鈥</translation>
+        <translation type="obsolete">鈥</translation>
     </message>
     <message>
         <source>Erbium</source>
-        <translation>鉺</translation>
+        <translation type="obsolete">鉺</translation>
     </message>
     <message>
         <source>Thulium</source>
-        <translation>銩</translation>
+        <translation type="obsolete">銩</translation>
     </message>
     <message>
         <source>Ytterbium</source>
-        <translation>鐿</translation>
+        <translation type="obsolete">鐿</translation>
     </message>
     <message>
         <source>Lutetium</source>
-        <translation>鎦</translation>
+        <translation type="obsolete">鎦</translation>
     </message>
     <message>
         <source>Hafnium</source>
-        <translation>鉿</translation>
+        <translation type="obsolete">鉿</translation>
     </message>
     <message>
         <source>Tantalum</source>
-        <translation>鉭</translation>
+        <translation type="obsolete">鉭</translation>
     </message>
     <message>
         <source>Tungsten</source>
-        <translation>鎢</translation>
+        <translation type="obsolete">鎢</translation>
     </message>
     <message>
         <source>Rhenium</source>
-        <translation>錸</translation>
+        <translation type="obsolete">錸</translation>
     </message>
     <message>
         <source>Osmium</source>
-        <translation>鋨</translation>
+        <translation type="obsolete">鋨</translation>
     </message>
     <message>
         <source>Iridium</source>
-        <translation>銥</translation>
+        <translation type="obsolete">銥</translation>
     </message>
     <message>
         <source>Platinum</source>
-        <translation>鉑</translation>
+        <translation type="obsolete">鉑</translation>
     </message>
     <message>
         <source>Gold</source>
-        <translation>金</translation>
+        <translation type="obsolete">金</translation>
     </message>
     <message>
         <source>Mercury</source>
-        <translation>汞</translation>
+        <translation type="obsolete">汞</translation>
     </message>
     <message>
         <source>Thallium</source>
-        <translation>鉈</translation>
+        <translation type="obsolete">鉈</translation>
     </message>
     <message>
         <source>Lead</source>
-        <translation>鉛</translation>
+        <translation type="obsolete">鉛</translation>
     </message>
     <message>
         <source>Bismuth</source>
-        <translation>鉍</translation>
+        <translation type="obsolete">鉍</translation>
     </message>
     <message>
         <source>Polonium</source>
-        <translation>釙</translation>
+        <translation type="obsolete">釙</translation>
     </message>
     <message>
         <source>Astatine</source>
-        <translation>厄</translation>
+        <translation type="obsolete">厄</translation>
     </message>
     <message>
         <source>Radon</source>
-        <translation>氡</translation>
+        <translation type="obsolete">氡</translation>
     </message>
     <message>
         <source>Francium</source>
-        <translation>鈁</translation>
+        <translation type="obsolete">鈁</translation>
     </message>
     <message>
         <source>Radium</source>
-        <translation>鐳</translation>
+        <translation type="obsolete">鐳</translation>
     </message>
     <message>
         <source>Actinium</source>
-        <translation>錒</translation>
+        <translation type="obsolete">錒</translation>
     </message>
     <message>
         <source>Thorium</source>
-        <translation>釷</translation>
+        <translation type="obsolete">釷</translation>
     </message>
     <message>
         <source>Protactinium</source>
-        <translation>鏷</translation>
+        <translation type="obsolete">鏷</translation>
     </message>
     <message>
         <source>Uranium</source>
-        <translation>鈾</translation>
+        <translation type="obsolete">鈾</translation>
     </message>
     <message>
         <source>Neptunium</source>
-        <translation>錼</translation>
+        <translation type="obsolete">錼</translation>
     </message>
     <message>
         <source>Plutonium</source>
-        <translation>鈽</translation>
+        <translation type="obsolete">鈽</translation>
     </message>
     <message>
         <source>Americium</source>
-        <translation>鋂</translation>
+        <translation type="obsolete">鋂</translation>
     </message>
     <message>
         <source>Curium</source>
-        <translation>鋦</translation>
+        <translation type="obsolete">鋦</translation>
     </message>
     <message>
         <source>Berkelium</source>
-        <translation>(金北)</translation>
+        <translation type="obsolete">(金北)</translation>
     </message>
     <message>
         <source>Californium</source>
-        <translation>鉲</translation>
+        <translation type="obsolete">鉲</translation>
     </message>
     <message>
         <source>Einsteinium</source>
-        <translation>鑀</translation>
+        <translation type="obsolete">鑀</translation>
     </message>
     <message>
         <source>Fermium</source>
-        <translation>鐨</translation>
+        <translation type="obsolete">鐨</translation>
     </message>
     <message>
         <source>Mendelevium</source>
-        <translation>鍆</translation>
+        <translation type="obsolete">鍆</translation>
     </message>
     <message>
         <source>Nobelium</source>
-        <translation>(金若)</translation>
+        <translation type="obsolete">(金若)</translation>
     </message>
     <message>
         <source>Lawrencium</source>
-        <translation>鐒</translation>
+        <translation type="obsolete">鐒</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
-        <translation>鑪</translation>
+        <translation type="obsolete">鑪</translation>
     </message>
     <message>
         <source>Dubnium</source>
-        <translation>(金杜)</translation>
+        <translation type="obsolete">(金杜)</translation>
     </message>
     <message>
         <source>Seaborgium</source>
-        <translation>(金喜)</translation>
+        <translation type="obsolete">(金喜)</translation>
     </message>
     <message>
         <source>Bohrium</source>
-        <translation>(金波)</translation>
+        <translation type="obsolete">(金波)</translation>
     </message>
     <message>
         <source>Hassium</source>
-        <translation>(金黑)</translation>
+        <translation type="obsolete">(金黑)</translation>
     </message>
     <message>
         <source>Meitnerium</source>
-        <translation>(金麥)</translation>
+        <translation type="obsolete">(金麥)</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/parashoot.ts b/i18n/zh_TW/parashoot.ts
index 96dba92..3dc00b7 100644
--- a/i18n/zh_TW/parashoot.ts
+++ b/i18n/zh_TW/parashoot.ts
@@ -1,27 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ParaShoot</name>
     <message>
         <source>ParaShoot</source>
-        <translation >ParaShoot</translation>
+        <translation>ParaShoot</translation>
     </message>
     <message>
         <source>New Game</source>
-        <translation >新遊戲</translation>
+        <translation>新遊戲</translation>
     </message>
     <message>
         <source>     Level: %1       Score: %2   </source>
-        <translation >     等級: %1       分數: %2   </translation>
+        <translation>     等級: %1       分數: %2   </translation>
     </message>
     <message>
         <source>       GAME OVER!
        Your Score:  %1
  Parachuters Killed: %2
         Accuracy: %3% </source>
         <translation>       GAME OVER!
        得分:  %1
  Parachuters Killed: %2
         Accuracy: %3% </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qasteroids.ts b/i18n/zh_TW/qasteroids.ts
index d100e92..4ca6731 100644
--- a/i18n/zh_TW/qasteroids.ts
+++ b/i18n/zh_TW/qasteroids.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KAstTopLevel</name>
     <message>
         <source>Asteroids</source>
         <translation>行星</translation>
     </message>
     <message>
         <source>Score</source>
-        <translation >來源</translation>
+        <translation>來源</translation>
     </message>
     <message>
         <source>Level</source>
-        <translation >等級</translation>
+        <translation>等級</translation>
     </message>
     <message>
         <source>Ships</source>
         <translation>太空梭</translation>
     </message>
     <message>
         <source>Fuel</source>
-        <translation >燃料</translation>
+        <translation>燃料</translation>
     </message>
     <message>
         <source>Press Calendar to start playing</source>
-        <translation >請按下Calender(行事曆) 以開始遊戲</translation>
+        <translation>請按下Calender(行事曆) 以開始遊戲</translation>
     </message>
     <message>
         <source>Ship Destroyed.
 Press Contacts/Home key.</source>
-        <translation >殘念~
+        <translation>殘念~
 請按下 Contacts/Home key</translation>
     </message>
     <message>
         <source>Game Over.
 Press Calendar for a new game.</source>
-        <translation >Game Over
+        <translation>Game Over
 請按下Calender(行事曆) 以開始新遊戲</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 5ee0e1e..f8e3f1a 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -1,248 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>請按下十字架中心以校正觸控筆</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>歡迎進入Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>文件</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>列表瀏覽</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation >低電量警告.
+        <translation>低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>business card </translation>
     </message>
     <message>
         <source>Information</source>
         <translation>訊息</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>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
-        <translation >電池狀態</translation>
+        <translation>電池狀態</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>啟動器</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - 啟動器</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>無應用程式</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 檔案</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>文件瀏覽</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation >A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
+        <translation>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation >音效</translation>
+        <translation>音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>影像</translation>
     </message>
     <message>
         <source>All</source>
         <translation>所有</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation >Limit search to dir: (not used yet)</translation>
+        <translation>Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>終止Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>重開機</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>重新啟動Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>關機</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>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>同步連結</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>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>沒有權限</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>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>淮許</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>同步中</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;連結&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index 98d859b..08d6c99 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -1,102 +1,106 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>設定通行碼</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>輸入通行碼</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>通行碼不正確</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>輸入的通行碼不正確.
 存取已拒絕</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>輸入新的通行碼</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>重新輸入新的通行碼</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>安全性設定</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>清除通行碼</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>在電源開啟時要求輸入通行碼</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>同步化</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>允許來自網路的同步化:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (預設值)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/systemtime.ts b/i18n/zh_TW/systemtime.ts
index 0bb3b23..add323c 100644
--- a/i18n/zh_TW/systemtime.ts
+++ b/i18n/zh_TW/systemtime.ts
@@ -1,284 +1,532 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation type="unfinished">時間格式</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation type="unfinished">hh:mm</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">D/M hh:mm</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/D hh:mm</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 小時制</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation type="unfinished">24 小時制</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation type="unfinished">12 小時制</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation type="unfinished">日期格式</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation type="unfinished">一星期開始於</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished">星期日</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished">星期一</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">設定</translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished">預報</translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished">您要求延遲 </translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"> 分鐘, 但是只有 </translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished">在執行 ntpdate 時發生錯誤</translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"> 秒</translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished">無法連線到伺服器 </translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
-        <translation>time.fu-berlin.de</translation>
+        <translation type="obsolete">time.fu-berlin.de</translation>
     </message>
     <message>
         <source>Run NTP?</source>
-        <translation>執行 NTP?</translation>
+        <translation type="obsolete">執行 NTP?</translation>
     </message>
     <message>
         <source>You asked for a delay of </source>
-        <translation>您要求延遲 </translation>
+        <translation type="obsolete">您要求延遲 </translation>
     </message>
     <message>
         <source> minutes, but only </source>
-        <translation> 分鐘, 但是只有 </translation>
+        <translation type="obsolete"> 分鐘, 但是只有 </translation>
     </message>
     <message>
         <source> minutes elapsed since last lookup.</source>
-        <translation> 分鐘前進行過查詢.</translation>
+        <translation type="obsolete"> 分鐘前進行過查詢.</translation>
     </message>
     <message>
         <source>Rerun NTP?</source>
-        <translation>重新執行 NTP?</translation>
+        <translation type="obsolete">重新執行 NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
-        <translation>執行中:</translation>
+        <translation type="obsolete">執行中:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation>在執行 ntpdate 時發生錯誤</translation>
+        <translation type="obsolete">在執行 ntpdate 時發生錯誤</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation> 秒</translation>
+        <translation type="obsolete"> 秒</translation>
     </message>
     <message>
         <source>last [h]</source>
-        <translation>上次 [h]</translation>
+        <translation type="obsolete">上次 [h]</translation>
     </message>
     <message>
         <source>offset [s]</source>
-        <translation>誤差 [s]</translation>
+        <translation type="obsolete">誤差 [s]</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
-        <translation>移位 [s/h]</translation>
+        <translation type="obsolete">移位 [s/h]</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation> s/h</translation>
+        <translation type="obsolete"> s/h</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>從網路取得時刻</translation>
+        <translation type="obsolete">從網路取得時刻</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
-        <translation>設定預報的時刻: </translation>
+        <translation type="obsolete">設定預報的時刻: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation>無法連線到伺服器 </translation>
+        <translation type="obsolete">無法連線到伺服器 </translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>預報</translation>
+        <translation type="obsolete">預報</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>主要</translation>
+        <translation type="obsolete">主要</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>設定</translation>
+        <translation type="obsolete">設定</translation>
     </message>
     <message>
         <source>ntp error</source>
-        <translation>ntp 錯誤</translation>
+        <translation type="obsolete">ntp 錯誤</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
-        <translation>從網路取得時刻時發生錯誤!</translation>
+        <translation type="obsolete">從網路取得時刻時發生錯誤!</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
-        <translation>從伺服器取得時刻時
+        <translation type="obsolete">從伺服器取得時刻時
 發生錯誤</translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
-        <translation>網路時刻</translation>
+        <translation type="obsolete">網路時刻</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>從網路取得時刻</translation>
+        <translation type="obsolete">從網路取得時刻</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation>開始時刻:</translation>
+        <translation type="obsolete">開始時刻:</translation>
     </message>
     <message>
         <source>nan</source>
-        <translation>nan</translation>
+        <translation type="obsolete">nan</translation>
     </message>
     <message>
         <source>Time Shift:</source>
-        <translation>時刻平移:</translation>
+        <translation type="obsolete">時刻平移:</translation>
     </message>
     <message>
         <source>New Time:</source>
-        <translation>新的時刻:</translation>
+        <translation type="obsolete">新的時刻:</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
-        <translation>估計平移:</translation>
+        <translation type="obsolete">估計平移:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
-        <translation>預報的時刻:</translation>
+        <translation type="obsolete">預報的時刻:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
-        <translation>平均平移:</translation>
+        <translation type="obsolete">平均平移:</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation>設定預報時刻</translation>
+        <translation type="obsolete">設定預報時刻</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation>預報時刻</translation>
+        <translation type="obsolete">預報時刻</translation>
     </message>
     <message>
         <source>Use</source>
-        <translation>使用</translation>
+        <translation type="obsolete">使用</translation>
     </message>
     <message>
         <source>as</source>
-        <translation>當做</translation>
+        <translation type="obsolete">當做</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
-        <translation>NTP 伺服器以便自網路取得時刻</translation>
+        <translation type="obsolete">NTP 伺服器以便自網路取得時刻</translation>
     </message>
     <message>
         <source>Wait for </source>
-        <translation>等候 </translation>
+        <translation type="obsolete">等候 </translation>
     </message>
     <message>
         <source>minutes until</source>
-        <translation>分鐘, 直到</translation>
+        <translation type="obsolete">分鐘, 直到</translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
-        <translation>NTP 嘗試讓時鐘與網路同步.</translation>
+        <translation type="obsolete">NTP 嘗試讓時鐘與網路同步.</translation>
     </message>
     <message>
         <source>Insure a delay of</source>
-        <translation>確保延遲時間</translation>
+        <translation type="obsolete">確保延遲時間</translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
-        <translation>將使用新的 NTP 查詢來預報時刻.</translation>
+        <translation type="obsolete">將使用新的 NTP 查詢來預報時刻.</translation>
     </message>
     <message>
         <source>Set time</source>
-        <translation>設定時刻</translation>
+        <translation type="obsolete">設定時刻</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>主要</translation>
+        <translation type="obsolete">主要</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation>手動</translation>
+        <translation type="obsolete">手動</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>設定</translation>
+        <translation type="obsolete">設定</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>預報</translation>
+        <translation type="obsolete">預報</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Advanced settings</source>
-        <translation>進階設定</translation>
+        <translation type="obsolete">進階設定</translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished">預報時刻</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">設定預報時刻</translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"> s/h</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"> 秒</translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation>時區</translation>
+        <translation type="obsolete">時區</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>日期</translation>
+        <translation type="obsolete">日期</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>時間格式</translation>
+        <translation type="obsolete">時間格式</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 小時制</translation>
+        <translation type="obsolete">24 小時制</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 小時制</translation>
+        <translation type="obsolete">12 小時制</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>一星期開始於</translation>
+        <translation type="obsolete">一星期開始於</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>星期日</translation>
+        <translation type="obsolete">星期日</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>星期一</translation>
+        <translation type="obsolete">星期一</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>日期格式</translation>
+        <translation type="obsolete">日期格式</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>小程式格式</translation>
+        <translation type="obsolete">小程式格式</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>hh:mm</translation>
+        <translation type="obsolete">hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>D/M hh:mm</translation>
+        <translation type="obsolete">D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/D hh:mm</translation>
+        <translation type="obsolete">M/D hh:mm</translation>
     </message>
     <message>
         <source>System Time</source>
-        <translation>系統時間</translation>
+        <translation type="obsolete">系統時間</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
-        <translation>時</translation>
+        <translation type="obsolete">時</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="obsolete">分</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="obsolete">AM</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="obsolete">PM</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation type="unfinished">時</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>分</translation>
+        <translation type="unfinished">分</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="unfinished">PM</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">設定預報時刻</translation>
     </message>
 </context>
 </TS>