1 files changed, 122 insertions, 85 deletions

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,65 +1,64 @@
 <!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>
@@ -67,127 +66,127 @@
         <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>
@@ -195,78 +194,116 @@
     <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>