diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index 31e9fbb..2592092 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,44 +15,43 @@
         <translation>Würdigung</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="498"/>
         <source>X</source>
-        <translation>X</translation>
+        <translation type="vanished">X</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="568"/>
+        <location filename="../aboutdialog.ui" line="554"/>
         <source>Release : Samuel de Champlain</source>
         <translation>Release : Samuel de Champlain</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="584"/>
+        <location filename="../aboutdialog.ui" line="570"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Die Microsoft Windows Oberfläche für Ring.
 Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="35"/>
+        <location filename="../aboutdialog.cpp" line="32"/>
         <source>Windows Ring</source>
         <translation>Windows Ring</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="36"/>
+        <location filename="../aboutdialog.cpp" line="33"/>
         <source>version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="43"/>
+        <location filename="../aboutdialog.cpp" line="40"/>
         <source>Created by:</source>
         <translation>Erstellt von:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="49"/>
         <source>Artwork by:</source>
         <translation>Visuelle Gestaltung:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="53"/>
         <source>Based on the SFLPhone project</source>
         <translation>Basierend auf dem SFLPhone-Projekt</translation>
     </message>
@@ -73,84 +74,83 @@
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="101"/>
+        <location filename="../accountdetails.ui" line="121"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="108"/>
+        <location filename="../accountdetails.ui" line="101"/>
         <source>Alias</source>
         <translation>Aliasname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="128"/>
         <source>Hash</source>
-        <translation>Hashwert</translation>
+        <translation type="vanished">Hashwert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="188"/>
+        <location filename="../accountdetails.ui" line="165"/>
         <source>Parameters</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="200"/>
+        <location filename="../accountdetails.ui" line="183"/>
         <source>Hostname</source>
         <translation>Rechnername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="226"/>
-        <location filename="../accountdetails.ui" line="936"/>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="925"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="252"/>
-        <location filename="../accountdetails.ui" line="955"/>
+        <location filename="../accountdetails.ui" line="209"/>
+        <location filename="../accountdetails.ui" line="944"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="281"/>
+        <location filename="../accountdetails.ui" line="238"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="307"/>
+        <location filename="../accountdetails.ui" line="264"/>
         <source>Voicemail number</source>
         <translation>Nummer für Sprachnachrichten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="327"/>
+        <location filename="../accountdetails.ui" line="284"/>
         <source>Auto-answer calls</source>
         <translation>Anrufe automatisch beantworten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="337"/>
+        <location filename="../accountdetails.ui" line="294"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiviert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="344"/>
+        <location filename="../accountdetails.ui" line="301"/>
         <source>DTMF tone type</source>
         <translation>DTMF Tontyp</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="353"/>
+        <location filename="../accountdetails.ui" line="310"/>
         <source>RTP</source>
         <translation>RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="363"/>
+        <location filename="../accountdetails.ui" line="320"/>
         <source>SIP</source>
         <translation>SIP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="391"/>
+        <location filename="../accountdetails.ui" line="398"/>
         <source>Allow Call From Unknown</source>
         <translation>Anruf von Unbekannt erlauben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="398"/>
+        <location filename="../accountdetails.ui" line="412"/>
         <source>Allow Call From Contact</source>
         <translation>Anruf von Kontakt erlauben</translation>
     </message>
@@ -160,258 +160,251 @@
         <translation>Anruf von Verlauf erlauben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="418"/>
+        <location filename="../accountdetails.ui" line="388"/>
         <source>Ring Account Settings</source>
         <translation>Ringkonto Einstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="459"/>
+        <location filename="../accountdetails.ui" line="448"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="545"/>
+        <location filename="../accountdetails.ui" line="534"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="561"/>
+        <location filename="../accountdetails.ui" line="540"/>
         <source>Enable Video</source>
         <translation>Video aktivieren</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="632"/>
+        <location filename="../accountdetails.ui" line="621"/>
         <source>Advanced</source>
         <translation>Erweitert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="659"/>
+        <location filename="../accountdetails.ui" line="648"/>
         <source>Registration</source>
         <translation>Registrierung</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="671"/>
+        <location filename="../accountdetails.ui" line="660"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Registrierungsverfallzeitüberschreitung (Sekunden):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="688"/>
         <source>Network Interface</source>
         <translation>Netzwerkschnittstelle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="708"/>
+        <location filename="../accountdetails.ui" line="697"/>
         <source>Local Port:</source>
         <translation>Lokaler Port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="756"/>
+        <location filename="../accountdetails.ui" line="745"/>
         <source>Published Adress</source>
         <translation>Veröffentlichte Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="771"/>
+        <location filename="../accountdetails.ui" line="760"/>
         <source>Same as local parameters</source>
         <translation>Identisch zu den lokalen Parametern</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="784"/>
+        <location filename="../accountdetails.ui" line="773"/>
         <source>Set published address and port:</source>
         <translation>Veröffentlichte Adresse und Port setzen:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="802"/>
+        <location filename="../accountdetails.ui" line="791"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="825"/>
+        <location filename="../accountdetails.ui" line="814"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="871"/>
+        <location filename="../accountdetails.ui" line="860"/>
         <source>Use STUN</source>
         <translation>STUN benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="887"/>
-        <location filename="../accountdetails.ui" line="920"/>
+        <location filename="../accountdetails.ui" line="876"/>
+        <location filename="../accountdetails.ui" line="909"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="904"/>
+        <location filename="../accountdetails.ui" line="893"/>
         <source>Use TURN</source>
         <translation>Turn benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="971"/>
+        <location filename="../accountdetails.ui" line="960"/>
         <source>Realm</source>
         <translation>Bereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="994"/>
+        <location filename="../accountdetails.ui" line="983"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP Sitzungsverhandlung (ICE Fallback)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1007"/>
+        <location filename="../accountdetails.ui" line="996"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Diese Einstellungen werden nur benutzt während einer SDP Sitzungsverhandlung, im Falle das ICE ist vom Server oder vom Teilnehmer nicht unterstützt wird.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1023"/>
+        <location filename="../accountdetails.ui" line="1012"/>
         <source>Audio RTP Port Range</source>
         <translation>Audio RTP Portbereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1038"/>
-        <location filename="../accountdetails.ui" line="1123"/>
+        <location filename="../accountdetails.ui" line="1027"/>
+        <location filename="../accountdetails.ui" line="1112"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1061"/>
-        <location filename="../accountdetails.ui" line="1146"/>
+        <location filename="../accountdetails.ui" line="1050"/>
+        <location filename="../accountdetails.ui" line="1135"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1108"/>
+        <location filename="../accountdetails.ui" line="1097"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP Portbereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1198"/>
+        <location filename="../accountdetails.ui" line="1187"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1225"/>
+        <location filename="../accountdetails.ui" line="1214"/>
         <source>Media Stream Encryption</source>
         <translation>Medienstromverschlüsselung</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1232"/>
+        <location filename="../accountdetails.ui" line="1221"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Medienströme verschlüsseln (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1241"/>
+        <location filename="../accountdetails.ui" line="1230"/>
         <source>Key exchange protocol</source>
         <translation>Schlüsselaustauschprotokoll</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1263"/>
+        <location filename="../accountdetails.ui" line="1252"/>
         <source>Fallback on RTP on encryption failure</source>
         <translation>Auf RTP zurückfallen wenn die Verschlüsselung fehlschlägt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1276"/>
+        <location filename="../accountdetails.ui" line="1265"/>
         <source>Negotiation Encryption</source>
         <translation>Verhandlungsverschlüsselung</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1283"/>
+        <location filename="../accountdetails.ui" line="1272"/>
         <source>Encrypt negotiation (TLS)</source>
         <translation>Verhandlung verschlüsseln (TLS)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1292"/>
+        <location filename="../accountdetails.ui" line="1281"/>
         <source>CA certificate</source>
         <translation>CA Zertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1302"/>
+        <location filename="../accountdetails.ui" line="1291"/>
         <source>User certificate</source>
         <translation>Benutzerzertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1312"/>
+        <location filename="../accountdetails.ui" line="1301"/>
         <source>Private key</source>
         <translation>Privater Schlüssel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1322"/>
+        <location filename="../accountdetails.ui" line="1311"/>
         <source>Private key password</source>
         <translation>Passwort für den privaten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1332"/>
+        <location filename="../accountdetails.ui" line="1321"/>
         <source>TLS protocol method</source>
         <translation>TLS Protokollmethode</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1342"/>
+        <location filename="../accountdetails.ui" line="1331"/>
         <source>Outgoing TLS server name</source>
         <translation>Ausgehender TLS Servername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1352"/>
+        <location filename="../accountdetails.ui" line="1341"/>
         <source>Negotiation timeout (seconds)</source>
         <translation>Verhandlungstimeout (Sekunden)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1470"/>
+        <location filename="../accountdetails.ui" line="1459"/>
         <source>Verify incoming certificates (server side)</source>
         <translation>Eingehende Zertifikate überprüfen (serverseitig)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1480"/>
+        <location filename="../accountdetails.ui" line="1469"/>
         <source>Verify answer certificates (client side)</source>
         <translation>Antwortzertifikate überprüfen (clientseitig)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1490"/>
+        <location filename="../accountdetails.ui" line="1479"/>
         <source>Require a certificate for incoming TLS connections</source>
         <translation>Ein Zertifikat für eingehende TLS-Verbindungen fordern</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1508"/>
+        <location filename="../accountdetails.ui" line="1497"/>
         <source>Cipher</source>
         <translation>Cipher</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1508"/>
         <source>Use default ciphers</source>
         <translation>Standardcipher verwenden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1529"/>
+        <location filename="../accountdetails.ui" line="1518"/>
         <source>User custom cipher list</source>
         <translation>Benutzerdefinierte Cipherliste verwenden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Enabled</source>
-        <translation>Aktiviert</translation>
+        <translation type="vanished">Aktiviert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="vanished">Name</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Bitrate</source>
-        <translation>Bitrate</translation>
+        <translation type="vanished">Bitrate</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
         <source>Samplerate</source>
-        <translation>Samplerate</translation>
+        <translation type="vanished">Samplerate</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="326"/>
+        <location filename="../accountdetails.cpp" line="180"/>
         <source>Choose File</source>
         <translation>Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="328"/>
+        <location filename="../accountdetails.cpp" line="182"/>
         <source>Files (*)</source>
         <translation>Dateien (*)</translation>
     </message>
@@ -419,88 +412,101 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="100"/>
+        <location filename="../callwidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="76"/>
+        <source>This is your RingID.
+Copy and share it with your friends!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="166"/>
+        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="258"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="134"/>
+        <location filename="../callwidget.ui" line="292"/>
         <source>Call</source>
         <translation>Anruf</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="148"/>
+        <location filename="../callwidget.ui" line="306"/>
         <source>Accept</source>
         <translation>Akzeptieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="159"/>
+        <location filename="../callwidget.ui" line="317"/>
         <source>Refuse</source>
         <translation>Verweigern</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="244"/>
+        <location filename="../callwidget.ui" line="440"/>
+        <source>Search / Enter number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>State:</source>
-        <translation>Zustand:</translation>
+        <translation type="vanished">Zustand:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="251"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="vanished">OK</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="329"/>
         <source>History</source>
-        <translation>Verlauf</translation>
+        <translation type="vanished">Verlauf</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="355"/>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="vanished">Suchen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="365"/>
         <source>Sort:</source>
-        <translation>Sortierung:</translation>
+        <translation type="vanished">Sortierung:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="413"/>
         <source>Contact</source>
-        <translation>Kontakt</translation>
+        <translation type="vanished">Kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="123"/>
+        <location filename="../callwidget.cpp" line="133"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="129"/>
+        <location filename="../callwidget.cpp" line="139"/>
         <source>Add to contact</source>
         <translation>Kontakt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="174"/>
-        <location filename="../callwidget.cpp" line="244"/>
         <source>Your RingID: %1</source>
         <comment>%1 is the RingID</comment>
-        <translation>Ihre Ring ID: %1</translation>
+        <translation type="vanished">Ihre Ring ID: %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="180"/>
+        <location filename="../callwidget.cpp" line="186"/>
+        <location filename="../callwidget.cpp" line="210"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>KEIN RING KONTO GEFUNDEN</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="260"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Call from %1</source>
         <comment>%1 is the name of the caller</comment>
         <translation>Anruf von %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
         <source>Call State: %1</source>
         <comment>%1 is the state of the call</comment>
-        <translation>Anrufszustand: %1</translation>
+        <translation type="vanished">Anrufszustand: %1</translation>
     </message>
 </context>
 <context>
@@ -516,54 +522,63 @@
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="48"/>
+        <location filename="../configurationwidget.ui" line="51"/>
         <source>History Settings</source>
         <translation>Verlaufseinstellungen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="57"/>
+        <location filename="../configurationwidget.ui" line="60"/>
         <source>Keep History for (days)</source>
         <translation>Verlauf behalten für (Tage)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="76"/>
+        <location filename="../configurationwidget.ui" line="79"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Auf 0 setzen für einen unbegrenzten Verlauf)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="101"/>
+        <location filename="../configurationwidget.ui" line="104"/>
         <source>Clear History</source>
         <translation>Verlauf leeren</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
+        <location filename="../configurationwidget.ui" line="119"/>
         <source>Ringtones Selection</source>
         <translation>Klingeltonauswahl</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="166"/>
+        <location filename="../configurationwidget.ui" line="158"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="165"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="189"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="208"/>
+        <location filename="../configurationwidget.ui" line="231"/>
         <source>Device Selection</source>
         <translation>Geräteauswahl</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="248"/>
+        <location filename="../configurationwidget.ui" line="271"/>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="271"/>
+        <location filename="../configurationwidget.ui" line="294"/>
         <source>Resolution</source>
         <translation>Auflösung</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="294"/>
         <source>Framerate</source>
-        <translation>Bildwiederholrate</translation>
+        <translation type="vanished">Bildwiederholrate</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="345"/>
@@ -581,12 +596,12 @@
         <translation>Ring beim Hochfahren starten</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="171"/>
+        <location filename="../configurationwidget.cpp" line="177"/>
         <source>New Account</source>
         <translation>Neues Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="202"/>
+        <location filename="../configurationwidget.cpp" line="198"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Sind sie sicher das sie den gesamten Verlauf leeren möchten?</translation>
     </message>
@@ -594,7 +609,7 @@
 <context>
     <name>ContactDelegate</name>
     <message>
-        <location filename="../contactdelegate.cpp" line="89"/>
+        <location filename="../contactdelegate.cpp" line="87"/>
         <source>&lt;Multiple contact methods&gt;</source>
         <translation>&lt;Mehrere Kontaktarten&gt;</translation>
     </message>
@@ -645,17 +660,17 @@
         <translation>Senden</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="42"/>
+        <location filename="../instantmessagingwidget.cpp" line="45"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="47"/>
+        <location filename="../instantmessagingwidget.cpp" line="50"/>
         <source>Display date</source>
         <translation>Anzeigedatum</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="50"/>
+        <location filename="../instantmessagingwidget.cpp" line="53"/>
         <source>Display author</source>
         <translation>Anzeigeauthor</translation>
     </message>
@@ -663,24 +678,20 @@
 <context>
     <name>MainBar</name>
     <message>
-        <location filename="../mainbar.ui" line="477"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
-        <location filename="../mainbar.ui" line="539"/>
         <source>Dial Number</source>
-        <translation>Wahlnummer</translation>
+        <translation type="vanished">Wahlnummer</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="32"/>
         <source>About</source>
-        <translation>Über</translation>
+        <translation type="vanished">Über</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="36"/>
         <source>Exit</source>
-        <translation>Schliessen</translation>
+        <translation type="vanished">Schliessen</translation>
     </message>
 </context>
 <context>
@@ -690,6 +701,11 @@
         <source>Ring</source>
         <translation>Ring</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>About</source>
+        <translation type="unfinished">Über</translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
@@ -700,39 +716,67 @@
     </message>
 </context>
 <context>
+    <name>TransferDialog</name>
+    <message>
+        <location filename="../transferdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../transferdialog.ui" line="23"/>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../transferdialog.ui" line="30"/>
+        <source>or type number...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../transferdialog.ui" line="40"/>
+        <source>Current Calls</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="29"/>
+        <location filename="../videooverlay.ui" line="157"/>
         <source>Hold</source>
         <translation>Halten</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="39"/>
+        <location filename="../videooverlay.ui" line="167"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="153"/>
+        <location filename="../videooverlay.ui" line="150"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="160"/>
+        <location filename="../videooverlay.ui" line="29"/>
         <source>Hangup</source>
         <translation>Auflegen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="167"/>
+        <location filename="../videooverlay.ui" line="36"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../videooverlay.cpp" line="36"/>
+        <location filename="../videooverlay.ui" line="174"/>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../videooverlay.cpp" line="38"/>
         <source>Mute Audio</source>
         <translation>Audio stummschalten</translation>
     </message>
     <message>
-        <location filename="../videooverlay.cpp" line="43"/>
+        <location filename="../videooverlay.cpp" line="45"/>
         <source>Mute Video</source>
         <translation>Video stummschalten</translation>
     </message>
@@ -740,17 +784,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="184"/>
+        <location filename="../videoview.cpp" line="181"/>
         <source>Share entire screen</source>
         <translation>Gesamten Bildschirm teilen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="189"/>
+        <location filename="../videoview.cpp" line="186"/>
         <source>Share screen area</source>
         <translation>Bildschirmbereich teilen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="195"/>
+        <location filename="../videoview.cpp" line="192"/>
         <source>Share file</source>
         <translation>Datei teilen</translation>
     </message>
@@ -758,19 +802,27 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.ui" line="429"/>
         <source>Wizard</source>
-        <translation>Assistent</translation>
+        <translation type="vanished">Assistent</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="458"/>
         <source>Greetings ! Please enter a username</source>
-        <translation>Willkommen! Bitte geben sie einen Benutzernamen ein</translation>
+        <translation type="vanished">Willkommen! Bitte geben sie einen Benutzernamen ein</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="61"/>
+        <location filename="../wizarddialog.cpp" line="52"/>
         <source>Please wait while we create your account.</source>
         <translation>Bitte warten sie während ihr Konto erstellt wird</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="937"/>
+        <source>Join the Ring</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="1000"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>