Merge from BRANCH_1_0.

1 files changed, 58 insertions, 335 deletions

diff --git a/i18n/da/systemtime.ts b/i18n/da/systemtime.ts
index 521e025..85862a6 100644
--- a/i18n/da/systemtime.ts
+++ b/i18n/da/systemtime.ts
@@ -1,521 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
-        <translation type="unfinished">Tidsformat</translation>
+        <translation>Tidsformat</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation type="unfinished">hh:mm</translation>
+        <translation>tt:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation type="unfinished">D/M hh:mm</translation>
+        <translation>D/M tt:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation type="unfinished">M/D hh:mm</translation>
+        <translation>M/D tt:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
-        <translation type="unfinished">12/24 timer</translation>
+        <translation>12/24 timer</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation type="unfinished">24 timer</translation>
+        <translation>24 timer</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation type="unfinished">12 timer</translation>
+        <translation>12 timer</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation type="unfinished">Datoformat</translation>
+        <translation>Datoformat</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation type="unfinished">Ugen starter med</translation>
+        <translation>Ugen starter med</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished">Søndag</translation>
+        <translation>Søndag</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished">Mandag</translation>
+        <translation>Mandag</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
-        <translation type="unfinished"></translation>
+        <translation>Dato/Tid</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Tid</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Format</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Indstillinger</translation>
+        <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="unfinished">Forudsig</translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Forudsig</translation>
     </message>
     <message>
         <source>Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du fortsætte?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
-        <translation type="unfinished"></translation>
+        <translation>Kører:
+ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fejl</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der opstod en fejl, kunne ikke hente klokken over netværket.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation type="unfinished">Fejl under kørslen af ntpdate</translation>
+        <translation>Fejl under kørslen af ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Tids-server</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke hente klokken fra
+server:</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"> sekunder</translation>
+        <source>Could not connect to server </source>
+        <translation>Kunne ikke forbinde til serveren </translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished">Kunne ikke forbinde til serveren </translation>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Du har bedt om %1 minutters mellemrum, men der er kun gået %2 minutter siden sidste gang klokken blev hentet.&lt;br&gt;Fortsæt?</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 sekunder</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttidspunkt</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="obsolete">time.fu-berlin.de</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Hovedmenu</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Indstillinger</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Forudsig</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="obsolete">Kør NTP?</translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="obsolete">Kører:</translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="obsolete">NTP Fejl</translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="obsolete">Fejl under forsøget på at
-hente tiden fra netværket!</translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="obsolete">Fejl under kørslen af ntpdate</translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="obsolete">Fejl under forsøget på at hente
-tiden fra serveren </translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="obsolete"> sekunder</translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="obsolete">sidste [h]</translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="obsolete">offset [s]</translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="obsolete">forskydning [s/t]</translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="obsolete"> s/t</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Hent tiden fra netværk</translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="obsolete">Brug forudsagt tid: </translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="obsolete">Kunne ikke forbinde til serveren </translation>
-    </message>
-    <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation type="obsolete">Du bad om en pause på %1 minutter, men kun %2 minutter er gået siden sidste opslag. &lt;br&gt; Kør NTP igen?</translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="obsolete">Netværks Tid</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Hovedmenu</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Hent tiden fra netværket</translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="obsolete">Start Tid:</translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="obsolete">Tids forskydning:</translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="obsolete">Ny Tid:</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Forudsig</translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="obsolete">Beregnet forskydning:</translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="obsolete">Forudsagt tid:</translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="obsolete">Gennemsnitlig forskydning:</translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="obsolete">Brug forudsagt tid</translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="obsolete">Forudsig tiden</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Indstillinger</translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="obsolete">Brug</translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="obsolete">som</translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="obsolete">NTP serveren klokken skal hentes fra på netværket.</translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="obsolete">Advancerede indstillinger</translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="obsolete">Vent i </translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="obsolete">minutter indtil</translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="obsolete">NTP prøver at synkronisere uret med netværket.</translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="obsolete">Sæt en pause på</translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="obsolete">et nyt NTP opslag vil blive brugt til at forudsige klokken.</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Manuel</translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="obsolete">Indstil tiden</translation>
+        <translation>Hent klokken over netværket</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
-        <translation type="unfinished"></translation>
+        <translation>Beregnet tidsforskydelse</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Estimated shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Estimeret tidsforskydelse</translation>
     </message>
     <message>
         <source>Predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Beregnet tid</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Forskydelse [s/t]</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation type="unfinished">Forudsig tiden</translation>
+        <translation>Beregn tiden</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished">Brug forudsagt tid</translation>
+        <translation>Brug beregnet tid</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation type="unfinished"> s/t</translation>
+        <translation> s/t</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"> sekunder</translation>
-    </message>
-</context>
-<context>
-    <name>SetDateTime</name>
-    <message>
-        <source>System Time</source>
-        <translation type="obsolete">Dato/Tid</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Tidszone</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Tidsformat</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 timer</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 timer</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Ugen starter med</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Søndag</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Mandag</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Datoformat</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Panelprogram format</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">hh:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M hh:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/D hh:mm</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Time</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minut</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
+        <translation> sekunder</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
-        <translation type="unfinished"></translation>
+        <translation>Tids-server</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minutter mellem opdateringer</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minutter mellem beregnet korrektion af uret</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis information om tids-server</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis information om beregnet tid</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation type="unfinished">Time</translation>
+        <translation>Time</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished">Minut</translation>
+        <translation>Minut</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished">AM</translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished">PM</translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Dato</translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <source>Time zone</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidszone</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Hent tid fra netværket</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished">Brug forudsagt tid</translation>
+        <translation>Brug forudsagt tid</translation>
     </message>
 </context>
 </TS>