8 files changed, 241 insertions, 135 deletions

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>