updates after opie-lupdate

8 files changed, 224 insertions, 134 deletions

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
@@ -276,124 +276,96 @@
         <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>
@@ -405,96 +377,139 @@ Are you sure?
     <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>
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,50 +1,53 @@
 <!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>
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
@@ -176,65 +176,61 @@
     </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,134 +1,134 @@
 <!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>
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
@@ -52,96 +52,104 @@ Keep power off until power restored!</source>
     <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>
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
@@ -54,50 +54,54 @@ Acesso negado</translation>
     <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>