update

9 files changed, 490 insertions, 98 deletions

diff --git a/i18n/de/aqpkg.ts b/i18n/de/aqpkg.ts
index 2504c1d..a9053a8 100644
--- a/i18n/de/aqpkg.ts
+++ b/i18n/de/aqpkg.ts
@@ -323,41 +323,41 @@ Um ein Paket auszuwählen klicken Sie in das Rechtecke auf der linken Seite.</tr
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Paketlistenerstellung für:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
-        <translation>Installiert auf - %1</translation>
+        <translation type="obsolete">Installiert auf - %1</translation>
     </message>
     <message>
         <source>Description - %1</source>
-        <translation>Beschreibung - %1</translation>
+        <translation type="obsolete">Beschreibung - %1</translation>
     </message>
     <message>
         <source>Size - %1</source>
-        <translation>Größe - %1</translation>
+        <translation type="obsolete">Größe - %1</translation>
     </message>
     <message>
         <source>Section - %1</source>
-        <translation>Sektion - %1</translation>
+        <translation type="obsolete">Sektion - %1</translation>
     </message>
     <message>
         <source>Filename - %1</source>
-        <translation>Dateiname - %1</translation>
+        <translation type="obsolete">Dateiname - %1</translation>
     </message>
     <message>
         <source>V. Installed - %1</source>
-        <translation>V. Installiert - %1</translation>
+        <translation type="obsolete">V. Installiert - %1</translation>
     </message>
     <message>
         <source>V. Available - %1</source>
-        <translation>V. Verfügbar - %1</translation>
+        <translation type="obsolete">V. Verfügbar - %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Aktualisierung der Paketliste</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
@@ -459,16 +459,59 @@ löschen oder aktualisieren ?</translation>
         <translation>U</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">Schliessen</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">Server</translation>
diff --git a/i18n/de/kpacman.ts b/i18n/de/kpacman.ts
index 692a37e..c600f7b 100644
--- a/i18n/de/kpacman.ts
+++ b/i18n/de/kpacman.ts
@@ -219,16 +219,20 @@ oder iist in einem unbekannten Format.</translation>
     <message>
         <source>PAUSED</source>
         <translation>PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@/@MM@/@YY@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
diff --git a/i18n/de/libliquid.ts b/i18n/de/libliquid.ts
index e57ac3a..a0c1704 100644
--- a/i18n/de/libliquid.ts
+++ b/i18n/de/libliquid.ts
@@ -1,69 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Liquid Stil</translation>
+        <translation type="unfinished">Liquid Stil</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Keine Transparenz</translation>
+        <translation type="unfinished">Keine Transparenz</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Stippled, Hintergrundfarbe</translation>
+        <translation type="unfinished">Stippled, Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Stippled, Buttonfarbe</translation>
+        <translation type="unfinished">Stippled, Buttonfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Transparent stippled, Hintergrundfarbe</translation>
+        <translation type="unfinished">Transparent stippled, Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Transparent stippled, Buttonfarbe</translation>
+        <translation type="unfinished">Transparent stippled, Buttonfarbe</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Nutzerdefinierte Transparenz</translation>
+        <translation type="unfinished">Nutzerdefinierte Transparenz</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Menufarbe</translation>
+        <translation type="unfinished">Menufarbe</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Textfarbe</translation>
+        <translation type="unfinished">Textfarbe</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Transparenz</translation>
+        <translation type="unfinished">Transparenz</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Schattierten Menutext nutzen</translation>
+        <translation type="unfinished">Schattierten Menutext nutzen</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Toolbarbuttons erscheinen flach</translation>
+        <translation type="unfinished">Toolbarbuttons erscheinen flach</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Stipplekontrast</translation>
+        <translation type="unfinished">Stipplekontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Hochperformanter Liquidstil von Mosfet</translation>
+        <translation type="unfinished">Hochperformanter Liquidstil von Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopieobex.ts b/i18n/de/libopieobex.ts
index aa330cd..a146793 100644
--- a/i18n/de/libopieobex.ts
+++ b/i18n/de/libopieobex.ts
@@ -1,51 +1,125 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ObexDlg</name>
     <message>
         <source>OBEX Sending</source>
-        <translation>OBEX Übertragung</translation>
+        <translation type="obsolete">OBEX Übertragung</translation>
     </message>
     <message>
         <source>Sending:</source>
-        <translation>Versende: </translation>
+        <translation type="obsolete">Versende: </translation>
     </message>
     <message>
         <source>filename</source>
-        <translation>Dateiname</translation>
+        <translation type="obsolete">Dateiname</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
+        <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>ObexInc</name>
     <message>
         <source>OBEX Receiving</source>
-        <translation>OBEX Emfang</translation>
+        <translation type="obsolete">OBEX Emfang</translation>
     </message>
     <message>
         <source>TextLabel1</source>
-        <translation>Textlabel1</translation>
+        <translation type="obsolete">Textlabel1</translation>
     </message>
     <message>
         <source>Filename</source>
-        <translation>Dateiname</translation>
+        <translation type="obsolete">Dateiname</translation>
     </message>
     <message>
         <source>A file was beamed 
 to you.</source>
-        <translation>Eine Datei wurde Ihnen 
+        <translation type="obsolete">Eine Datei wurde Ihnen 
 zugesendet.</translation>
     </message>
     <message>
         <source>Insert</source>
-        <translation>Einfügen</translation>
+        <translation type="obsolete">Einfügen</translation>
     </message>
     <message>
         <source>Reject</source>
-        <translation>Ablehnen</translation>
+        <translation type="obsolete">Ablehnen</translation>
+    </message>
+</context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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/de/opieftp.ts b/i18n/de/opieftp.ts
index da04ce1..6e5d32d 100644
--- a/i18n/de/opieftp.ts
+++ b/i18n/de/opieftp.ts
@@ -225,17 +225,17 @@ It must be empty</source>
         <translation>Konnte nicht umbennen </translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Dieses Verzeichnis existiert nicht</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>Über</translation>
+        <translation type="obsolete">Über</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Neu scannen</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Neuer Servername</translation>
diff --git a/i18n/de/oxygen.ts b/i18n/de/oxygen.ts
index 0b848e1..9a5dc3d 100644
--- a/i18n/de/oxygen.ts
+++ b/i18n/de/oxygen.ts
@@ -26,17 +26,17 @@
         <source>Elemental Composition (%):</source>
         <translation>elementare Zusammensetzunh (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
-        <translation>Gewicht:</translation>
+        <translation type="obsolete">Gewicht:</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Block</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
@@ -80,16 +80,20 @@
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index 5e60d17..f328f81 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -96,16 +96,24 @@ Bitte laden Sie sie auf.</translation>
     <message>
         <source>No application</source>
         <translation>Keine Anwendung</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Es ist keine Anwendung für dieses Dokument des Typs %1 definiert&lt;/p&gt;.</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>%1 Dateien</translation>
     </message>
     <message>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index c6ae005..45ff63b 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -96,10 +96,14 @@ Gerät erhalten.</translation>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (Standard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/systemtime.ts b/i18n/de/systemtime.ts
index c501edb..99efcf2 100644
--- a/i18n/de/systemtime.ts
+++ b/i18n/de/systemtime.ts
@@ -1,271 +1,519 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation type="unfinished">Zeitformat</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation type="unfinished">ss:mm</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">Sonntag</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/T ss:mm</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 Stunden</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation type="unfinished">24 Stunden</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation type="unfinished">12 Stunden</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation type="unfinished">Datumsformat</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation type="unfinished">Woche startet am</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished">Sontag</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished">Montag</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">Einstellungen</translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished">Vorschlag</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>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished">Fehler beim Ausführen</translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"> Sekunden</translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished">Keine Verbindung zu Server </translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></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>time.fu-berlin.de</translation>
+        <translation type="obsolete">time.fu-berlin.de</translation>
     </message>
     <message>
         <source>Run NTP?</source>
-        <translation>Starte NTP?</translation>
+        <translation type="obsolete">Starte NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
-        <translation>fe aus:</translation>
+        <translation type="obsolete">fe aus:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation>Fehler beim Ausführen</translation>
+        <translation type="obsolete">Fehler beim Ausführen</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation> Sekunden</translation>
+        <translation type="obsolete"> Sekunden</translation>
     </message>
     <message>
         <source>last [h]</source>
-        <translation>Letzte [Std]</translation>
+        <translation type="obsolete">Letzte [Std]</translation>
     </message>
     <message>
         <source>offset [s]</source>
-        <translation>Abweichung</translation>
+        <translation type="obsolete">Abweichung</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
-        <translation>Differenz [s/h]</translation>
+        <translation type="obsolete">Differenz [s/h]</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation> s/h</translation>
+        <translation type="obsolete"> s/h</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>Zeit vom Netzwerk holen</translation>
+        <translation type="obsolete">Zeit vom Netzwerk holen</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
-        <translation>Vorschlag:</translation>
+        <translation type="obsolete">Vorschlag:</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation>Keine Verbindung zu Server </translation>
+        <translation type="obsolete">Keine Verbindung zu Server </translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Vorschlag</translation>
+        <translation type="obsolete">Vorschlag</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>Main</translation>
+        <translation type="obsolete">Main</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <translation type="obsolete">Einstellungen</translation>
     </message>
     <message>
         <source>ntp error</source>
-        <translation>NTP Fehler</translation>
+        <translation type="obsolete">NTP Fehler</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
-        <translation>Fehler, Zeitabgleich vom Netzwerk nicht möglich !</translation>
+        <translation type="obsolete">Fehler, Zeitabgleich vom Netzwerk nicht möglich !</translation>
     </message>
     <message>
         <source>Error while getting time from server </source>
-        <translation>Fehler beim Abgleich mit dem Zeitserver</translation>
+        <translation type="obsolete">Fehler beim Abgleich mit dem Zeitserver</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>Sie haben eine Differenz von %1 Minuten eingestellt, es sind aber lediglich %2 seit dem letzten Abgleich vergangen. Zeit dennoch abgleichen ?</translation>
+        <translation type="obsolete">Sie haben eine Differenz von %1 Minuten eingestellt, es sind aber lediglich %2 seit dem letzten Abgleich vergangen. Zeit dennoch abgleichen ?</translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
-        <translation>Netzwerk Zeit</translation>
+        <translation type="obsolete">Netzwerk Zeit</translation>
     </message>
     <message>
         <source>Get time from network</source>
-        <translation>Mit Netz abgleichen</translation>
+        <translation type="obsolete">Mit Netz abgleichen</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation>Startzeit:</translation>
+        <translation type="obsolete">Startzeit:</translation>
     </message>
     <message>
         <source>nan</source>
-        <translation>nan</translation>
+        <translation type="obsolete">nan</translation>
     </message>
     <message>
         <source>Time Shift:</source>
-        <translation>Zeitverschiebung:</translation>
+        <translation type="obsolete">Zeitverschiebung:</translation>
     </message>
     <message>
         <source>New Time:</source>
-        <translation>Neue Zeit:</translation>
+        <translation type="obsolete">Neue Zeit:</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
-        <translation>Erwartete Versch.:</translation>
+        <translation type="obsolete">Erwartete Versch.:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
-        <translation>Zeitvoraussage:</translation>
+        <translation type="obsolete">Zeitvoraussage:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
-        <translation>Mittl. Versch.</translation>
+        <translation type="obsolete">Mittl. Versch.</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation>Vorschlag setzen</translation>
+        <translation type="obsolete">Vorschlag setzen</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation>Zeitvorschlag</translation>
+        <translation type="obsolete">Zeitvorschlag</translation>
     </message>
     <message>
         <source>Use</source>
-        <translation>Verwende</translation>
+        <translation type="obsolete">Verwende</translation>
     </message>
     <message>
         <source>as</source>
-        <translation>als</translation>
+        <translation type="obsolete">als</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
-        <translation>NTP Server für Zeitabgleich.</translation>
+        <translation type="obsolete">NTP Server für Zeitabgleich.</translation>
     </message>
     <message>
         <source>Wait for </source>
-        <translation>Warte auf </translation>
+        <translation type="obsolete">Warte auf </translation>
     </message>
     <message>
         <source>minutes until</source>
-        <translation>Minuten bis</translation>
+        <translation type="obsolete">Minuten bis</translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
-        <translation>NTP-Abgleich mit dem Netzserver</translation>
+        <translation type="obsolete">NTP-Abgleich mit dem Netzserver</translation>
     </message>
     <message>
         <source>Insure a delay of</source>
-        <translation>Mindestdifferenz </translation>
+        <translation type="obsolete">Mindestdifferenz </translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
-        <translation>NTP-Abgleich wird als Vorschlag verwendet.</translation>
+        <translation type="obsolete">NTP-Abgleich wird als Vorschlag verwendet.</translation>
     </message>
     <message>
         <source>Set time</source>
-        <translation>Zeit setzen</translation>
+        <translation type="obsolete">Zeit setzen</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation>Haupt</translation>
+        <translation type="obsolete">Haupt</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation>Manuell</translation>
+        <translation type="obsolete">Manuell</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <translation type="obsolete">Einstellungen</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Vorschlag</translation>
+        <translation type="obsolete">Vorschlag</translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation>NTP</translation>
+        <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Advanced settings</source>
-        <translation>Erweitert</translation>
+        <translation type="obsolete">Erweitert</translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation type="unfinished"></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">Zeitvorschlag</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished">Vorschlag setzen</translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"> s/h</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"> Sekunden</translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
-        <translation>Zeitzone</translation>
+        <translation type="obsolete">Zeitzone</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Datum</translation>
+        <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Time format</source>
-        <translation>Zeitformat</translation>
+        <translation type="obsolete">Zeitformat</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation>24 Stunden</translation>
+        <translation type="obsolete">24 Stunden</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation>12 Stunden</translation>
+        <translation type="obsolete">12 Stunden</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation>Woche startet am</translation>
+        <translation type="obsolete">Woche startet am</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation>Sontag</translation>
+        <translation type="obsolete">Sontag</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation>Montag</translation>
+        <translation type="obsolete">Montag</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation>Datumsformat</translation>
+        <translation type="obsolete">Datumsformat</translation>
     </message>
     <message>
         <source>Applet format</source>
-        <translation>Appletformat</translation>
+        <translation type="obsolete">Appletformat</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation>ss:mm</translation>
+        <translation type="obsolete">ss:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>Sonntag</translation>
+        <translation type="obsolete">Sonntag</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/T ss:mm</translation>
+        <translation type="obsolete">M/T ss:mm</translation>
     </message>
     <message>
         <source>System Time</source>
-        <translation>System Zeit</translation>
+        <translation type="obsolete">System Zeit</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
-        <translation>Stunde</translation>
+        <translation type="obsolete">Stunde</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Minute</translation>
+        <translation type="obsolete">Minute</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="obsolete">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="obsolete">PM</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation type="unfinished">Stunde</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation type="unfinished">Minute</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation type="unfinished">AM</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation type="unfinished">PM</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Datum</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">Vorschlag setzen</translation>
     </message>
 </context>
 </TS>