From 0799b67a825c8ec00e57a63e5a5d55fd26bb2337 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 15:23:37 +0000
Subject: Merge from BRANCH_1_0.

---
(limited to 'i18n/pt_BR/systemtime.ts')

diff --git a/i18n/pt_BR/systemtime.ts b/i18n/pt_BR/systemtime.ts
index 4834641..c16c802 100644
--- a/i18n/pt_BR/systemtime.ts
+++ b/i18n/pt_BR/systemtime.ts
@@ -70,18 +70,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -112,11 +100,15 @@ ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -191,64 +183,6 @@ ntpdate </source>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Semana começa no(a)</translation>
-    </message>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Zona Horária</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 horas</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Segunda</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 horas</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Domingo</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Formato de data</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <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>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>
--
cgit v0.9.0.2